More nuanced waterway

layers/waterway/waterway.yaml

@@ -6,6 +6,7 @@ layer:
       Too short linestrings are filtered out for some zoom levels. Waterways do no not have a `subclass`.
   buffer_size: 4
   fields:
+    name: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the waterway or the name from Natural Earth for lower zoom levels.
     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),
@@ -15,8 +16,9 @@ layer:
         [`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
+    query: (SELECT geometry, name, class FROM layer_waterway(!bbox!, z(!scale_denominator!))) AS t
 schema:
+  - ./merge_waterway.sql
   - ./waterway.sql
 datasources:
   - type: imposm3