earlier bike roads (and walking routes)

data/functions.sql

@@ -638,9 +638,12 @@ BEGIN
   RETURN (
     SELECT
         MIN(
-            CASE WHEN hstore(tags)->'network' IN ('iwn', 'nwn', 'icn','ncn') THEN 11
-                 WHEN hstore(tags)->'network' IN ('rwn', 'rcn') THEN 12
-                 WHEN hstore(tags)->'network' IN ('lwn', 'lcn') THEN 13
+            CASE WHEN hstore(tags)->'network' IN ('icn', 'ncn') THEN 8
+                 WHEN hstore(tags)->'network' IN ('iwn', 'nwn') THEN 9
+                 WHEN hstore(tags)->'network' IN ('rcn') THEN 10
+                 WHEN hstore(tags)->'network' IN ('rwn') THEN 11
+                 WHEN hstore(tags)->'network' IN ('lcn') THEN 11
+                 WHEN hstore(tags)->'network' IN ('lwn') THEN 12
             ELSE NULL
             END
         )
@@ -898,7 +901,7 @@ BEGIN
 END;
 $$ LANGUAGE plpgsql IMMUTABLE;
 
---- Identifies and returns the min_zoom for gates 
+--- Identifies and returns the min_zoom for gates
 --- given the highway level of gate location
 CREATE OR REPLACE FUNCTION mz_get_min_zoom_highway_level_gate(val_osm_id BIGINT)
 RETURNS SMALLINT AS $$

data/migrations/v1.3.0-line.sql

@@ -0,0 +1,9 @@
+UPDATE planet_osm_line
+  SET mz_road_level = mz_calculate_min_zoom_roads(planet_osm_line.*)
+  WHERE
+      (tags -> 'highway' IN ( 'trunk_link', 'primary_link', 'secondary_link', 'tertiary_link',
+                   'residential', 'unclassified', 'road', 'living_street', 'pedestrian',
+                   'path', 'track', 'cycleway', 'bridleway', 'footway', 'steps',
+                   'service' ) OR
+       tags -> 'whitewater' = 'portage_way')
+      AND mz_calculate_min_zoom_roads(planet_osm_line.*) IS NOT NULL;

docs/layers.md

@@ -1103,10 +1103,10 @@ To improve performance, some road segments are merged at low and mid-zooms. To f
 
 #### Road Transportation `kind_detail` values and zoom ranges:
 
-**Roads** from **OpenStreetMap** are shown starting at zoom 8 with `motorway`, `trunk`, `primary`. `secondary` are added starting at zoom 10, with `motorway_link`, `tertiary` added at zoom 11. Zoom 12 sees addition of `trunk_link`, `residential`, `unclassified`, and `road`, and internationally and nationally significant paths (`path`, `footway`, `steps`). Zoom 13 adds `primary_link`, `secondary_link`, `raceway`, `track`, `pedestrian`, `living_street`, `cycleway` and `bridleway` and regionally significant and/or named or designated paths. Zoom 14 adds `tertiary_link`, all remaining `path`, `footway`, and `steps`, `corridor`, and `alley` service roads. By zoom 15 all remaining service roads are added, including `driveway`, `parking_aisle`, `drive_through`.
-
 **Roads** from **Natural Earth**  are used at low zooms below 8. Road `kind_detail` values are limited to `motorway`, `trunk`, `primary`, `secondary`, `tertiary`.
 
+**Roads** from **OpenStreetMap** are shown starting at zoom 8 with `motorway`, `trunk`, `primary`. `secondary` are added starting at zoom 10, with `motorway_link`, `tertiary` added at zoom 11. Zoom 12 sees addition of `trunk_link`, `residential`, `unclassified`, and `road`. Zoom 13 adds `primary_link`, `secondary_link`, `raceway`, `track`, `pedestrian`, `living_street`, `cycleway` and `bridleway`. Zoom 14 adds `tertiary_link`, all remaining `path`, `footway`, and `steps`, `corridor`, and `alley` service roads. By zoom 15 all remaining service roads are added, including `driveway`, `parking_aisle`, `drive_through`. Internationally and nationally significant paths (`path`, `footway`, `steps`) are added at zoom 9, regionally significant paths are added at zoom 11, locally significant at zoom 12, and named or designated paths at zoom 13. Internationally and nationally significant bicycle routes are added at zoom 8, regionally significant bike routes at zoom 10, and locally significant at zoom 11.
+
 **Ferries** from both Natural Earth and OpenStreetMap are shown starting at zoom 5 with `kind` values of `ferry`.
 
 ![image](images/mapzen-vector-tile-docs-roads-railway.png)

integration-test/1170-very-early-paths-and-bike-routes.py

@@ -0,0 +1,90 @@
+# highway=path, with route inter-national
+# GR5-Grand Traverse de Jura between France and Switzerland
+# https://www.openstreetmap.org/way/285975282
+# https://www.openstreetmap.org/relation/6009161
+assert_has_feature(
+    9, 265, 179, 'roads',
+    { 'kind': 'path', 'walking_network': 'iwn' } )
+
+# highway=path, with route national (Pacific Crest Trail) at zoom 9
+# https://www.openstreetmap.org/way/236361475
+# https://www.openstreetmap.org/relation/1225378
+assert_has_feature(
+    9, 86, 197, 'roads',
+    { 'kind': 'path', 'walking_network': 'nwn' } )
+
+# highway=path, with route regional (Merced Pass Trail) at zoom 11
+# https://www.openstreetmap.org/way/373491941
+# https://www.openstreetmap.org/relation/5549623
+assert_has_feature(
+   11, 343, 792, 'roads',
+   { 'kind': 'path', 'walking_network': 'rwn'  } )
+
+# highway=unclassified, with route local (Grant Avenue) at zoom 12
+# part of The Barbary Coast Trail in San Francisco
+# https://www.openstreetmap.org/way/91181758
+# https://www.openstreetmap.org/relation/6322028
+assert_has_feature(
+   12, 655, 1582, 'roads',
+   { 'kind': 'minor_road', 'walking_network': 'lwn' } )
+
+# Way: North Sea Cycle Route - part Netherlands (1977662)
+# A really long highway=cycleway
+# https://www.openstreetmap.org/way/35568189
+# https://www.openstreetmap.org/relation/1977662
+# https://www.openstreetmap.org/relation/1975739
+# https://www.openstreetmap.org/relation/5294
+# https://www.openstreetmap.org/relation/537418
+assert_has_feature(
+    8, 131, 83, 'roads',
+    { 'kind': 'path', 'is_bicycle_related': True, 'bicycle_network': 'icn' })
+
+# Ferry between Denmark and Germany, icn
+# https://www.openstreetmap.org/way/128631318
+# https://www.openstreetmap.org/relation/721738
+assert_has_feature(
+    8, 136, 81, 'roads',
+    { 'kind': 'ferry', 'is_bicycle_related': True, 'bicycle_network': 'icn' })
+
+# Søndervangsvej minor road in Denmark as national cycle route
+# https://www.openstreetmap.org/way/149701891
+# https://www.openstreetmap.org/relation/349521
+assert_has_feature(
+    8, 136, 79, 'roads',
+    { 'kind': 'minor_road', 'is_bicycle_related': True, 'bicycle_network': 'ncn' })
+
+# Part of Bay Trail in South (San Francisco) Bay
+# way is marked rcn=yes, and part of a proper bike relation
+# http://www.openstreetmap.org/way/44422697
+# http://www.openstreetmap.org/relation/325779
+assert_has_feature(
+    10, 164, 396, 'roads',
+    { 'kind': 'path', 'is_bicycle_related': True, 'bicycle_network': 'rcn' })
+
+# Hyltebjerg Allé residential road with rcn in Copenhagen
+# https://www.openstreetmap.org/way/2860759
+# https://www.openstreetmap.org/relation/2087590
+assert_has_feature(
+    10, 547, 320, 'roads',
+    { 'kind': 'minor_road', 'is_bicycle_related': True, 'bicycle_network': 'rcn' })
+
+# lcn in Seattle (living street that would only be visible at zoom 13 otherwise) at zoom 11
+# https://www.openstreetmap.org/way/6477775
+# https://www.openstreetmap.org/relation/3541926
+assert_has_feature(
+    11, 327, 715, 'roads',
+    { 'kind': 'minor_road', 'bicycle_network': 'lcn' })
+
+# Kirkham Street lcn in San Francisco at zoom 11
+# https://www.openstreetmap.org/way/89802424
+# https://www.openstreetmap.org/relation/32313
+assert_has_feature(
+    11, 327, 791, 'roads',
+    { 'kind': 'minor_road', 'bicycle_network': 'lcn' })
+
+# Asiatisk Plads service road with lcn in Copenhagen
+# https://www.openstreetmap.org/way/164049387
+# https://www.openstreetmap.org/relation/6199242
+assert_has_feature(
+    11, 1095, 641, 'roads',
+    { 'kind': 'minor_road', 'bicycle_network': 'lcn' })

integration-test/1175-bicycle-route-refs.py

@@ -11,14 +11,15 @@
       'all_bicycle_shield_texts': ['45'] })
 
 # make sure the all_* lists are gone by zoom 12 on major roads, but the "most
-# important" network & shield text remain until.
+# important", singular network & shield text remain at earlier zooms
 assert_has_feature(
     10, 163, 395, 'roads',
     { 'bicycle_network': 'lcn',
       'bicycle_shield_text': '45' })
+
 assert_no_matching_feature(
-    10, 163, 395, 'roads',
+    12, 655, 1583, 'roads',
     { 'all_bicycle_networks': None })
 assert_no_matching_feature(
-    10, 163, 395, 'roads',
+    12, 655, 1583, 'roads',
     { 'all_bicycle_shield_texts': None })

integration-test/1194-bus-route-refs.py

@@ -30,17 +30,18 @@
       'all_bus_shield_texts': ['3', '3'] })
 
 # make sure the all_* lists are gone by zoom 12 on major roads, but the "most
-# important" network & shield text remain until.
+# important", singular network & shield text remain at earlier zooms
 #
 # note that it doesn't matter what the bus shield is - that's data-dependent.
 # for the purposes of the test, we only care that there _is_ one.
 assert_has_feature(
     10, 163, 395, 'roads',
     { 'bus_network': type(None),
       'bus_shield_text': None })
+
 assert_no_matching_feature(
-    10, 163, 395, 'roads',
+    12, 654, 1583, 'roads',
     { 'all_bus_networks': None })
 assert_no_matching_feature(
-    10, 163, 395, 'roads',
+    12, 654, 1583, 'roads',
     { 'all_bus_shield_texts': None })

integration-test/593-early-path.py

@@ -1,22 +1,27 @@
-tiles = [
-    # highway=path, with route national (Pacific Crest Trail)
-    # https://www.openstreetmap.org/way/236361475
-    # https://www.openstreetmap.org/relation/1225378
-    [11, 345, 790],
-    # highway=path, with route regional (Merced Pass Trail)
-    # https://www.openstreetmap.org/way/373491941
-    # https://www.openstreetmap.org/relation/5549623
-    [12, 687, 1584],
-    # highway=path, with route regional (Merced Pass Trail)
-    # https://www.openstreetmap.org/way/39996451
-    # https://www.openstreetmap.org/relation/5549623
-    [12, 688, 1584],
-    # highway=path, no route, but has name (Upper Yosemite Falls Trail)
-    # https://www.openstreetmap.org/way/162322353
-    [13, 1374, 3166]
-]
+# highway=path, with route national (Pacific Crest Trail)
+# https://www.openstreetmap.org/way/236361475
+# https://www.openstreetmap.org/relation/1225378
+assert_has_feature(
+11, 345, 790, 'roads',
+{ 'walking_network': 'nwn',
+  'walking_shield_text': 'PCT' })
 
-for z, x, y in tiles:
-    assert_has_feature(
-        z, x, y, 'roads',
-        {'kind_detail': 'path', 'name': None})
+# highway=path, with route regional (Merced Pass Trail)
+# https://www.openstreetmap.org/way/373491941
+# https://www.openstreetmap.org/relation/5549623
+assert_has_feature(
+	12, 687, 1584, 'roads',
+	{'kind_detail': 'path', 'name': None, 'walking_network': None})
+
+# highway=path, with route regional (Merced Pass Trail)
+# https://www.openstreetmap.org/way/39996451
+# https://www.openstreetmap.org/relation/5549623
+assert_has_feature(
+	12, 688, 1584, 'roads',
+	{'kind_detail': 'path', 'name': None, 'walking_network': None})
+
+# highway=path, no route, but has name (Upper Yosemite Falls Trail)
+# https://www.openstreetmap.org/way/162322353
+assert_has_feature(
+	13, 1374, 3166, 'roads',
+	{'kind_detail': 'path', 'name': None})

queries.yaml

@@ -502,45 +502,89 @@ post_process:
     params:
       source_layer: roads
       start_zoom: 0
-      end_zoom: 14
-      properties: [oneway, crossing, sidewalk, sidewalk_left, sidewalk_right, surface]
+      end_zoom: 12
+      properties:
+        - bicycle
+        - colour
+        - foot
+        - operator
+        - route          # NVK (2017425): this is a suspicious tag
+        - route_name     # NVK (2017425): this is a suspicious tag
+        - sac_scale
+        - state
+        - surface
+        - symbol
+        - tracktype
+        - type           # NVK (2017425): this is a suspicious tag
+  # drop certain road properties at lower zooms
   - fn: vectordatasource.transform.drop_properties
     params:
       source_layer: roads
       start_zoom: 0
-      end_zoom: 14
+      end_zoom: 13
       properties:
-        - name
-        - ref
-        - network
-        - shield_text
-        - all_networks
-        - all_shield_texts
-        - bicycle_network
-        - bicycle_shield_text
         - all_bicycle_networks
         - all_bicycle_shield_texts
         - all_walking_networks
         - all_walking_shield_texts
-        - bus_network
-        - bus_shield_text
         - all_bus_networks
         - all_bus_shield_texts
+  # drop certain road properties at lower zooms
+  - fn: vectordatasource.transform.drop_properties
+    params:
+      source_layer: roads
+      start_zoom: 0
+      end_zoom: 14
+      properties:
+        - ascent
+        - crossing
+        - descent
+        - description
+        - distance
+        - horse
+        - incline
+        - motor_vehicle
+        - oneway
+        - oneway_bicycle
+        - ramp
+        - ramp_bicycle
+        - roundtrip
+        - segregated
+        - sidewalk
+        - sidewalk_left
+        - sidewalk_right
+        - sport
+        - surface
+        - trail_visibility
+  # drop name and other properties on early paths to
+  # allow more line merging (use walking network for labeling)
+  - fn: vectordatasource.transform.drop_properties
+    params:
+      source_layer: roads
+      start_zoom: 0
+      end_zoom: 11
+      properties:
+        - name
+        - ref
       where: >-
-        (kind == 'rail' and zoom < 15) or
-        (kind == 'minor_road' and zoom < 14) or
-        (kind == 'major_road' and zoom <  7)
-  # previous tests assume we keep walking network information until zoom 11
+        kind == 'path'
   - fn: vectordatasource.transform.drop_properties
     params:
       source_layer: roads
       start_zoom: 0
-      end_zoom: 10
+      end_zoom: 14
       properties:
-        - walking_network
-        - walking_shield_text
+        - name
+        - ref
+        - network
+        - shield_text
+        - all_networks
+        - all_shield_texts
+        - bus_network
+        - bus_shield_text
       where: >-
-        (kind == 'rail') or (kind == 'minor_road') or
+        (kind == 'rail' and zoom < 15) or
+        (kind == 'minor_road' and zoom < 14) or
         (kind == 'major_road' and zoom <  7)
   # this is a patch because we still want to drop name, network from major_road
   # features between zoom 7 and 10
@@ -553,12 +597,6 @@ post_process:
         - name
         - all_networks
         - all_shield_texts
-        - all_bicycle_networks
-        - all_bicycle_shield_texts
-        - all_walking_networks
-        - all_walking_shield_texts
-        - all_bus_networks
-        - all_bus_shield_texts
       where: >-
         kind == 'major_road'
   # this is a patch to get rid of name, but keep ref & network, for highways
@@ -585,6 +623,8 @@ post_process:
         - all_shield_texts
         - walking_network
         - walking_shield_text
+        - bicycle_network
+        - bicycle_shield_text
       where: >-
         kind == 'highway'
   # drop non-road shield stuff a good deal earlier.
@@ -594,8 +634,6 @@ post_process:
       start_zoom: 0
       end_zoom: 10
       properties:
-        - bicycle_network
-        - bicycle_shield_text
         - all_bicycle_networks
         - all_bicycle_shield_texts
         - all_walking_networks
@@ -606,6 +644,17 @@ post_process:
         - all_bus_shield_texts
       where: >-
         kind == 'highway'
+  # drop walking network related properties on all roads early
+  # as paths are only brought in at zoom 9 and these properties
+  # on other kinds would prevent merging at zoom 8 and earlier
+  - fn: vectordatasource.transform.drop_properties
+    params:
+      source_layer: roads
+      start_zoom: 0
+      end_zoom: 8
+      properties:
+        - walking_network
+        - walking_shield_text
   - fn: vectordatasource.transform.update_parenthetical_properties
     params:
       source_layer: pois