From 94aca0e3527817d659cc34ca1300c67a308bbc5c Mon Sep 17 00:00:00 2001
From: lukasmartinelli <me@lukasmartinelli.ch>
Date: Sat, 29 Oct 2016 15:16:21 +0200
Subject: [PATCH] Document water_name and waterway

---
 Makefile                          |   8 +++++++-
 layers/water_name/README.md       |  14 ++++++++++++++
 layers/water_name/water_name.yaml |  11 ++++++++---
 layers/waterway/README.md         |  20 ++++++++++++++++++++
 layers/waterway/mapping.png       | Bin 0 -> 10725 bytes
 layers/waterway/waterway.yaml     |  12 +++++++++++-
 6 files changed, 60 insertions(+), 5 deletions(-)
 create mode 100644 layers/water_name/README.md
 create mode 100644 layers/waterway/README.md
 create mode 100644 layers/waterway/mapping.png

diff --git a/Makefile b/Makefile
index dd0634b..2c661f9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 all: build/openmaptiles.tm2source/data.yml build/mapping.yaml build/tileset.sql
 
 .PHONY: docs
-docs: layers/railway/README.md layers/boundary/README.md layers/water/README.md layers/building/README.md layers/highway/README.md layers/highway_name/README.md layers/poi/README.md layers/place/README.md
+docs: layers/railway/README.md layers/boundary/README.md layers/water/README.md layers/building/README.md layers/highway/README.md layers/highway_name/README.md layers/poi/README.md layers/place/README.md layers/waterway/README.md layers/water_name/README.md
 
 build/openmaptiles.tm2source/data.yml:
 	mkdir -p build/openmaptiles.tm2source && generate-tm2source openmaptiles.yaml --host="postgres" --port=5432 --database="openmaptiles" --user="openmaptiles" --password="openmaptiles" > build/openmaptiles.tm2source/data.yml
@@ -27,9 +27,15 @@ layers/railway/README.md:
 layers/boundary/README.md:
 	generate-doc layers/boundary/boundary.yaml --diagram layers/boundary/mapping > layers/boundary/README.md
 
+layers/water_name/README.md:
+	generate-doc layers/water_name/water_name.yaml > layers/water_name/README.md
+
 layers/water/README.md:
 	generate-doc layers/water/water.yaml --diagram layers/water/mapping > layers/water/README.md
 
+layers/waterway/README.md:
+	generate-doc layers/waterway/waterway.yaml --diagram layers/waterway/mapping > layers/waterway/README.md
+
 layers/building/README.md:
 	generate-doc layers/building/building.yaml > layers/building/README.md
 
diff --git a/layers/water_name/README.md b/layers/water_name/README.md
new file mode 100644
index 0000000..a87f4eb
--- /dev/null
+++ b/layers/water_name/README.md
@@ -0,0 +1,14 @@
+# water_name
+
+Lake center lines for labelling lake bodies.
+This is based of the [osm-lakelines](https://github.com/lukasmartinelli/osm-lakelines) project
+which derives nice centerlines from OSM water bodies. Only the most important lakes contain labels.
+
+## 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*.
+
+
+
diff --git a/layers/water_name/water_name.yaml b/layers/water_name/water_name.yaml
index 8080b44..33d6b00 100644
--- a/layers/water_name/water_name.yaml
+++ b/layers/water_name/water_name.yaml
@@ -1,11 +1,16 @@
 layer:
   id: "water_name"
   description: |
-      OSM lakelines.
+      Lake center lines for labelling lake bodies.
+      This is based of the [osm-lakelines](https://github.com/lukasmartinelli/osm-lakelines) project
+      which derives nice centerlines from OSM water bodies. Only the most important lakes contain labels.
+  fields:
+    name: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the water body.
+    name_en: The english `name:en` value if available.
+    class: |
+        At the moment only `lake` since no ocean parts are labelled. *Reserved for future use*.
   buffer_size: 8
   srs: +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over
-  fields:
-    class: String
   datasource:
     geometry_field: geometry
     srid: 900913
diff --git a/layers/waterway/README.md b/layers/waterway/README.md
new file mode 100644
index 0000000..4898394
--- /dev/null
+++ b/layers/waterway/README.md
@@ -0,0 +1,20 @@
+# 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`.
+
+## Fields
+
+- **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
+
+![](mapping.png)
+
+
diff --git a/layers/waterway/mapping.png b/layers/waterway/mapping.png
new file mode 100644
index 0000000000000000000000000000000000000000..51a4f6e7369c48345c8d77357a7f6cb8027718b3
GIT binary patch
literal 10725
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%0D#67
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

literal 0
HcmV?d00001

diff --git a/layers/waterway/waterway.yaml b/layers/waterway/waterway.yaml
index 10c8421..e822331 100644
--- a/layers/waterway/waterway.yaml
+++ b/layers/waterway/waterway.yaml
@@ -1,8 +1,18 @@
 layer:
   id: "waterway"
   description: |
-      OpenStreetMap waterways.
+      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`.
   buffer_size: 4
+  fields:
+    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)`.
   datasource:
     geometry_field: geometry
     query: (SELECT geometry, class FROM layer_waterway(!bbox!, z(!scale_denominator!))) AS t