Skip to content

Commit

Permalink
Render barrier=jersey_barrier
Browse files Browse the repository at this point in the history
barrier=jersey_barrier on node is rendered as barrier=block/log
barrier=jersey_barrier on way is rendered as default barrier, i.e. same as wall, fence
  • Loading branch information
dch0ph committed Jan 10, 2024
1 parent 50e7457 commit 0f0a049
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
6 changes: 3 additions & 3 deletions project.mml
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ Layer:
WHERE way && !bbox!
) _
WHERE barrier IN ('chain', 'city_wall', 'ditch', 'fence', 'guard_rail',
'handrail', 'hedge', 'retaining_wall', 'wall')
'handrail', 'hedge', 'retaining_wall', 'wall', 'jersey_barrier')
OR historic = 'citywalls'
AND (waterway IS NULL OR waterway NOT IN ('river', 'canal', 'stream', 'drain', 'ditch'))
) AS features
Expand Down Expand Up @@ -2287,7 +2287,7 @@ Layer:
'amenity_' || CASE WHEN amenity IN ('bench', 'waste_basket', 'waste_disposal') AND way_area IS NULL THEN amenity END,
'historic_' || CASE WHEN historic IN ('wayside_cross', 'wayside_shrine') AND way_area IS NULL THEN historic END,
'man_made_' || CASE WHEN man_made IN ('cross') AND way_area IS NULL THEN man_made END,
'barrier_' || CASE WHEN barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block', 'log', 'cattle_grid', 'stile', 'motorcycle_barrier', 'cycle_barrier', 'full-height_turnstile', 'turnstile', 'kissing_gate') THEN barrier END
'barrier_' || CASE WHEN barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block', 'log', 'cattle_grid', 'stile', 'motorcycle_barrier', 'cycle_barrier', 'full-height_turnstile', 'turnstile', 'kissing_gate', 'jersey_barrier') THEN barrier END
) AS feature,
CASE WHEN access IN ('private', 'no', 'customers', 'permit', 'delivery') THEN 'restricted' ELSE 'yes' END AS int_access,
way_area,
Expand Down Expand Up @@ -2328,7 +2328,7 @@ Layer:
OR amenity IN ('bench', 'waste_basket', 'waste_disposal')
OR historic IN ('wayside_cross', 'wayside_shrine')
OR man_made IN ('cross')
OR barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block', 'log', 'cattle_grid', 'stile', 'motorcycle_barrier', 'cycle_barrier', 'full-height_turnstile', 'turnstile', 'kissing_gate')
OR barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block', 'log', 'cattle_grid', 'stile', 'motorcycle_barrier', 'cycle_barrier', 'full-height_turnstile', 'turnstile', 'kissing_gate', 'jersey_barrier')
ORDER BY
CASE amenity
WHEN 'waste_basket' THEN 1
Expand Down
1 change: 1 addition & 0 deletions style/amenity-points.mss
Original file line number Diff line number Diff line change
Expand Up @@ -1567,6 +1567,7 @@
[feature = 'barrier_bollard'],
[feature = 'barrier_block'],
[feature = 'barrier_log'],
[feature = 'barrier_jersey_barrier'],
[feature = 'barrier_turnstile'] {
[zoom >= 17] {
marker-width: 3;
Expand Down

0 comments on commit 0f0a049

Please sign in to comment.