Merge pull request #1225 from tilezen/nvkelso/1224-track-motor_vehicle-property

Include motor_vehicle, horse properties earlier

Author: nvkelso

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

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

integration-test/1224-earlier-bike-properties.py

@@ -0,0 +1,5 @@
+# Bobcat Trail
+# https://www.openstreetmap.org/way/12188550
+assert_has_feature(
+    13, 1308, 3164, 'roads',
+    {'motor_vehicle': 'no'})

queries.yaml

@@ -502,11 +502,13 @@ post_process:
     params:
       source_layer: roads
       start_zoom: 0
-      end_zoom: 12
+      end_zoom: 11
       properties:
         - bicycle
         - colour
         - foot
+        - horse
+        - motor_vehicle
         - operator
         - route          # NVK (2017425): this is a suspicious tag
         - route_name     # NVK (2017425): this is a suspicious tag
@@ -541,9 +543,7 @@ post_process:
         - descent
         - description
         - distance
-        - horse
         - incline
-        - motor_vehicle
         - oneway
         - oneway_bicycle
         - ramp