allow where access=no and bicycles are allowed

Author: mitchellhenke

brokenspoke_analyzer/scripts/sql/features/functional_class.sql

@@ -24,7 +24,14 @@ WHERE
         'primary',
         'living_street'
     )
-    AND (osm.access IS NULL OR osm.access NOT IN ('no', 'private'));
+    AND (
+        osm.access IS NULL
+        OR (
+            osm.access = 'no'
+            AND osm.bicycle IN ('yes', 'permissive', 'designated')
+        )
+        OR osm.access NOT IN ('no', 'private')
+    );
 
 UPDATE neighborhood_ways
 SET functional_class = 'track'
@@ -33,15 +40,29 @@ WHERE
     neighborhood_ways.osm_id = osm.osm_id
     AND osm.highway = 'track'
     AND osm.tracktype = 'grade1'
-    AND (osm.access IS NULL OR osm.access NOT IN ('no', 'private'));
+    AND (
+        osm.access IS NULL
+        OR (
+            osm.access = 'no'
+            AND osm.bicycle IN ('yes', 'permissive', 'designated')
+        )
+        OR osm.access NOT IN ('no', 'private')
+    );
 
 UPDATE neighborhood_ways
 SET functional_class = 'path'
 FROM neighborhood_osm_full_line AS osm
 WHERE
     neighborhood_ways.osm_id = osm.osm_id
     AND osm.highway IN ('cycleway', 'path')
-    AND (osm.access IS NULL OR osm.access NOT IN ('no', 'private'));
+    AND (
+        osm.access IS NULL
+        OR (
+            osm.access = 'no'
+            AND osm.bicycle IN ('yes', 'permissive', 'designated')
+        )
+        OR osm.access NOT IN ('no', 'private')
+    );
 
 UPDATE neighborhood_ways
 SET
@@ -52,7 +73,14 @@ WHERE
     neighborhood_ways.osm_id = osm.osm_id
     AND osm.highway = 'footway'
     AND osm.footway IN ('crossing', 'traffic_island')
-    AND (osm.access IS NULL OR osm.access NOT IN ('no', 'private'));
+    AND (
+        osm.access IS NULL
+        OR (
+            osm.access = 'no'
+            AND osm.bicycle IN ('yes', 'permissive', 'designated')
+        )
+        OR osm.access NOT IN ('no', 'private')
+    );
 
 UPDATE neighborhood_ways
 SET functional_class = 'path'
@@ -61,7 +89,14 @@ WHERE
     neighborhood_ways.osm_id = osm.osm_id
     AND osm.highway = 'footway'
     AND osm.bicycle IN ('yes', 'permissive', 'designated')
-    AND (osm.access IS NULL OR osm.access NOT IN ('no', 'private'))
+    AND (
+        osm.access IS NULL
+        OR (
+            osm.access = 'no'
+            AND osm.bicycle IN ('yes', 'permissive', 'designated')
+        )
+        OR osm.access NOT IN ('no', 'private')
+    )
     AND COALESCE(width_ft, 0) >= 8;
 
 UPDATE neighborhood_ways
@@ -71,7 +106,14 @@ WHERE
     neighborhood_ways.osm_id = osm.osm_id
     AND osm.highway = 'service'
     AND osm.bicycle IN ('yes', 'permissive', 'designated')
-    AND (osm.access IS NULL OR osm.access NOT IN ('no', 'private'));
+    AND (
+        osm.access IS NULL
+        OR (
+            osm.access = 'no'
+            AND osm.bicycle IN ('yes', 'permissive', 'designated')
+        )
+        OR osm.access NOT IN ('no', 'private')
+    );
 
 UPDATE neighborhood_ways
 SET functional_class = 'living_street'
@@ -80,7 +122,14 @@ WHERE
     neighborhood_ways.osm_id = osm.osm_id
     AND osm.highway = 'pedestrian'
     AND osm.bicycle IN ('yes', 'permissive', 'designated')
-    AND (osm.access IS NULL OR osm.access NOT IN ('no', 'private'));
+    AND (
+        osm.access IS NULL
+        OR (
+            osm.access = 'no'
+            AND osm.bicycle IN ('yes', 'permissive', 'designated')
+        )
+        OR osm.access NOT IN ('no', 'private')
+    );
 
 -- remove stuff that we don't want to route over
 DELETE FROM neighborhood_ways