Riverine water types

Makefile

@@ -480,7 +480,7 @@ generate-changed-tiles: data/tiles.txt
 	fi
 
 .PHONY: start-tileserver
-start-tileserver: init-dirs
+start-tileserver: init-dirs build-style download-fonts
 	@echo " "
 	@echo "***********************************************************"
 	@echo "* "

layers/transportation/update_transportation_merge.sql

@@ -327,7 +327,14 @@ BEGIN
     FROM osm_transportation_merge_linestring_gen_z6
     WHERE
         (update_id IS NULL OR id = update_id) AND
-        -- Current view: motorway/trunk
+        -- Current view: all motorways and trunks of national-importance
+        (highway = 'motorway'
+            OR construction = 'motorway'
+            -- Allow trunk roads that are part of a nation's most important route network to show at z4
+            OR highway = 'trunk' AND
+                network <> '' AND
+                network IN ('ca-transcanada','us-interstate')
+        ) AND
         ST_Length(geometry) > 500;
 
     DELETE FROM osm_transportation_merge_linestring_gen_z4
@@ -349,7 +356,8 @@ BEGIN
     FROM osm_transportation_merge_linestring_gen_z5
     WHERE
         (update_id IS NULL OR id = update_id) AND
-        (highway = 'motorway' OR construction = 'motorway') AND
+        -- Current view: national-importance motorways and trunks
+        network IN ('ca-transcanada','us-interstate') AND
         ST_Length(geometry) > 1000;
 END;
 $$ LANGUAGE plpgsql;

layers/water/mapping.yaml

@@ -104,4 +104,9 @@ tables:
       - dock
       water:
       - river
+      - stream
+      - canal
+      - ditch
+      - drain
+      - lake
     type: polygon

layers/water/water.sql

@@ -1,6 +1,7 @@
 CREATE OR REPLACE FUNCTION water_class(waterway text, water text, leisure text) RETURNS text AS
 $$
 SELECT CASE
+           WHEN water IN ('river', 'canal', 'stream', 'ditch', 'drain') THEN 'river'
            %%FIELD_MAPPING: class %%
            ELSE 'lake'
            END;

layers/water/water.yaml

@@ -25,15 +25,19 @@ layer:
     class:
       description: |
           All water polygons from [OpenStreetMapData](http://osmdata.openstreetmap.de/) have the class `ocean`.
-          Water bodies with the [`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`. 
+          The water-covered areas of flowing water bodies with the [`water=river`](http://wiki.openstreetmap.org/wiki/Tag:water=river), 
+          [`water=canal`](http://wiki.openstreetmap.org/wiki/Tag:water=canal),
+          [`water=stream`](http://wiki.openstreetmap.org/wiki/Tag:water=stream),
+          [`water=ditch`](http://wiki.openstreetmap.org/wiki/Tag:water=ditch), or
+          [`water=drain`](http://wiki.openstreetmap.org/wiki/Tag:water=drain) tags are classified as river.  Wet and dry docks
+          tagged [`waterway=dock`](http://wiki.openstreetmap.org/wiki/Tag:waterway=dock) are classified as a `dock`.
           Swimming pools tagged [`leisure=swimming_pool`](https://wiki.openstreetmap.org/wiki/Tag:leisure=swimming_pool) are classified as a `swimming_pool`
           All other water bodies are classified as `lake`.
       values:
         dock:
           waterway: 'dock'
         river:
-          water: 'river'
+          water: ['river', 'stream', 'canal', 'ditch', 'drain']
         lake:
         ocean:
         swimming_pool: