From fd045019a8710939181300c32c4eebb5d7f90107 Mon Sep 17 00:00:00 2001 From: brainwad Date: Sun, 29 Nov 2020 19:04:38 +0100 Subject: [PATCH] SQL style fixes --- project.mml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/project.mml b/project.mml index 09502e10..b6e6553b 100644 --- a/project.mml +++ b/project.mml @@ -498,12 +498,12 @@ Layer: END AS oneway, CASE WHEN tags->'cycleway:left' IN ('track', 'opposite_track') THEN 'track' - WHEN tags->'sidewalk:left:bicycle' != 'no' and tags->'sidewalk:left:segregated' = 'yes' then 'track' + WHEN tags->'sidewalk:left:bicycle' != 'no' AND tags->'sidewalk:left:segregated' = 'yes' then 'track' WHEN tags->'cycleway:left' IN ('lane', 'opposite_lane') THEN 'lane' WHEN tags->'sidewalk:left:bicycle' = 'yes' then 'sidewalk' WHEN tags->'cycleway:left' IN ('share_busway', 'opposite_share_busway', 'shoulder', 'shared_lane') THEN 'busway' WHEN tags->'cycleway:both' IN ('track', 'opposite_track') THEN 'track' - WHEN tags->'sidewalk:both:bicycle' != 'no' and tags->'sidewalk:left:segregated' = 'yes' then 'track' + WHEN tags->'sidewalk:both:bicycle' != 'no' AND tags->'sidewalk:left:segregated' = 'yes' then 'track' WHEN tags->'cycleway:both' IN ('lane', 'opposite_lane') THEN 'lane' WHEN tags->'sidewalk:both:bicycle' = 'yes' then 'sidewalk' WHEN tags->'cycleway:both' IN ('share_busway', 'opposite_share_busway', 'shoulder', 'shared_lane') THEN 'busway' @@ -514,12 +514,12 @@ Layer: END AS cycleway_left_render, CASE WHEN tags->'cycleway:right' IN ('track', 'opposite_track') THEN 'track' - WHEN tags->'sidewalk:right:bicycle' != 'no' and tags->'sidewalk:left:segregated' = 'yes' then 'track' + WHEN tags->'sidewalk:right:bicycle' != 'no' AND tags->'sidewalk:left:segregated' = 'yes' then 'track' WHEN tags->'cycleway:right' IN ('lane', 'opposite_lane') THEN 'lane' WHEN tags->'sidewalk:right:bicycle' = 'yes' then 'sidewalk' WHEN tags->'cycleway:right' IN ('share_busway', 'opposite_share_busway', 'shoulder', 'shared_lane') THEN 'busway' WHEN tags->'cycleway:both' IN ('track', 'opposite_track') THEN 'track' - WHEN tags->'sidewalk:both:bicycle' != 'no' and tags->'sidewalk:left:segregated' = 'yes' then 'track' + WHEN tags->'sidewalk:both:bicycle' != 'no' AND tags->'sidewalk:left:segregated' = 'yes' then 'track' WHEN tags->'cycleway:both' IN ('lane', 'opposite_lane') THEN 'lane' WHEN tags->'sidewalk:both:bicycle' = 'yes' then 'sidewalk' WHEN tags->'cycleway:both' IN ('share_busway', 'opposite_share_busway', 'shoulder', 'shared_lane') THEN 'busway' @@ -683,12 +683,12 @@ Layer: END AS oneway, CASE WHEN tags->'cycleway:left' IN ('track', 'opposite_track') THEN 'track' - WHEN tags->'sidewalk:left:bicycle' != 'no' and tags->'sidewalk:left:segregated' = 'yes' then 'track' + WHEN tags->'sidewalk:left:bicycle' != 'no' AND tags->'sidewalk:left:segregated' = 'yes' then 'track' WHEN tags->'cycleway:left' IN ('lane', 'opposite_lane') THEN 'lane' WHEN tags->'sidewalk:left:bicycle' = 'yes' then 'sidewalk' WHEN tags->'cycleway:left' IN ('share_busway', 'opposite_share_busway', 'shoulder', 'shared_lane') THEN 'busway' WHEN tags->'cycleway:both' IN ('track', 'opposite_track') THEN 'track' - WHEN tags->'sidewalk:both:bicycle' != 'no' and tags->'sidewalk:left:segregated' = 'yes' then 'track' + WHEN tags->'sidewalk:both:bicycle' != 'no' AND tags->'sidewalk:left:segregated' = 'yes' then 'track' WHEN tags->'cycleway:both' IN ('lane', 'opposite_lane') THEN 'lane' WHEN tags->'sidewalk:both:bicycle' = 'yes' then 'sidewalk' WHEN tags->'cycleway:both' IN ('share_busway', 'opposite_share_busway', 'shoulder', 'shared_lane') THEN 'busway' @@ -699,12 +699,12 @@ Layer: END AS cycleway_left_render, CASE WHEN tags->'cycleway:right' IN ('track', 'opposite_track') THEN 'track' - WHEN tags->'sidewalk:right:bicycle' <> 'no' and tags->'sidewalk:left:segregated' = 'yes' then 'track' + WHEN tags->'sidewalk:right:bicycle' != 'no' AND tags->'sidewalk:left:segregated' = 'yes' then 'track' WHEN tags->'cycleway:right' IN ('lane', 'opposite_lane') THEN 'lane' WHEN tags->'sidewalk:right:bicycle' = 'yes' then 'sidewalk' WHEN tags->'cycleway:right' IN ('share_busway', 'opposite_share_busway', 'shoulder', 'shared_lane') THEN 'busway' WHEN tags->'cycleway:both' IN ('track', 'opposite_track') THEN 'track' - WHEN tags->'sidewalk:both:bicycle' <> 'no' and tags->'sidewalk:left:segregated' = 'yes' then 'track' + WHEN tags->'sidewalk:both:bicycle' != 'no' AND tags->'sidewalk:left:segregated' = 'yes' then 'track' WHEN tags->'cycleway:both' IN ('lane', 'opposite_lane') THEN 'lane' WHEN tags->'sidewalk:both:bicycle' = 'yes' then 'sidewalk' WHEN tags->'cycleway:both' IN ('share_busway', 'opposite_share_busway', 'shoulder', 'shared_lane') THEN 'busway' @@ -954,12 +954,12 @@ Layer: END AS oneway, CASE WHEN tags->'cycleway:left' IN ('track', 'opposite_track') THEN 'track' - WHEN tags->'sidewalk:left:bicycle' != 'no' and tags->'sidewalk:left:segregated' = 'yes' then 'track' + WHEN tags->'sidewalk:left:bicycle' != 'no' AND tags->'sidewalk:left:segregated' = 'yes' then 'track' WHEN tags->'cycleway:left' IN ('lane', 'opposite_lane') THEN 'lane' WHEN tags->'sidewalk:left:bicycle' = 'yes' then 'sidewalk' WHEN tags->'cycleway:left' IN ('share_busway', 'opposite_share_busway', 'shoulder', 'shared_lane') THEN 'busway' WHEN tags->'cycleway:both' IN ('track', 'opposite_track') THEN 'track' - WHEN tags->'sidewalk:both:bicycle' != 'no' and tags->'sidewalk:left:segregated' = 'yes' then 'track' + WHEN tags->'sidewalk:both:bicycle' != 'no' AND tags->'sidewalk:left:segregated' = 'yes' then 'track' WHEN tags->'cycleway:both' IN ('lane', 'opposite_lane') THEN 'lane' WHEN tags->'sidewalk:both:bicycle' = 'yes' then 'sidewalk' WHEN tags->'cycleway:both' IN ('share_busway', 'opposite_share_busway', 'shoulder', 'shared_lane') THEN 'busway' @@ -970,12 +970,12 @@ Layer: END AS cycleway_left_render, CASE WHEN tags->'cycleway:right' IN ('track', 'opposite_track') THEN 'track' - WHEN tags->'sidewalk:right:bicycle' != 'no' and tags->'sidewalk:left:segregated' = 'yes' then 'track' + WHEN tags->'sidewalk:right:bicycle' != 'no' AND tags->'sidewalk:left:segregated' = 'yes' then 'track' WHEN tags->'cycleway:right' IN ('lane', 'opposite_lane') THEN 'lane' WHEN tags->'sidewalk:right:bicycle' = 'yes' then 'sidewalk' WHEN tags->'cycleway:right' IN ('share_busway', 'opposite_share_busway', 'shoulder', 'shared_lane') THEN 'busway' WHEN tags->'cycleway:both' IN ('track', 'opposite_track') THEN 'track' - WHEN tags->'sidewalk:both:bicycle' != 'no' and tags->'sidewalk:left:segregated' = 'yes' then 'track' + WHEN tags->'sidewalk:both:bicycle' != 'no' AND tags->'sidewalk:left:segregated' = 'yes' then 'track' WHEN tags->'cycleway:both' IN ('lane', 'opposite_lane') THEN 'lane' WHEN tags->'sidewalk:both:bicycle' = 'yes' then 'sidewalk' WHEN tags->'cycleway:both' IN ('share_busway', 'opposite_share_busway', 'shoulder', 'shared_lane') THEN 'busway'