Skip to content

Commit

Permalink
add more barrier icons
Browse files Browse the repository at this point in the history
  • Loading branch information
Adamant36 committed Dec 26, 2018
1 parent 5d5ef10 commit 6148df3
Show file tree
Hide file tree
Showing 6 changed files with 165 additions and 5 deletions.
31 changes: 30 additions & 1 deletion amenity-points.mss
Original file line number Diff line number Diff line change
Expand Up @@ -1695,9 +1695,38 @@
marker-clip: false;
}

[feature = 'barrier_motorcycle_barrier'][zoom >= 17]::barrier {
marker-file: url('symbols/barrier/motorcycle_barrier.svg');
marker-fill: #3f3f3f;
marker-placement: interior;
marker-clip: false;
}

[feature = 'barrier_cycle_barrier'][zoom >= 17]::barrier {
marker-file: url('symbols/barrier/cycle_barrier.svg');
marker-fill: #3f3f3f;
marker-placement: interior;
marker-clip: false;
}

[feature = 'barrier_full-height_turnstile'][zoom >= 17]::barrier {
marker-file: url('symbols/barrier/full-height_turnstile.svg');
marker-fill: #3f3f3f;
marker-placement: interior;
marker-clip: false;
}

[feature = 'barrier_kissing_gate'][zoom >= 17]::barrier {
marker-file: url('symbols/barrier/kissing_gate.svg');
marker-fill: #3f3f3f;
marker-placement: interior;
marker-clip: false;
}

[feature = 'barrier_bollard'],
[feature = 'barrier_block'],
[feature = 'barrier_log'] {
[feature = 'barrier_log'],
[feature = 'barrier_turnstile'] {
[zoom >= 17] {
marker-width: 3;
marker-line-width: 0;
Expand Down
8 changes: 4 additions & 4 deletions project.mml
Original file line number Diff line number Diff line change
Expand Up @@ -2547,7 +2547,7 @@ Layer:
'waste_basket', 'waste_disposal') THEN amenity ELSE NULL END,
'historic_' || CASE WHEN historic IN ('wayside_cross', 'wayside_shrine') THEN historic ELSE NULL END,
'man_made_' || CASE WHEN man_made IN ('cross') THEN man_made ELSE NULL END,
'barrier_' || CASE WHEN barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block', 'log', 'cattle_grid', 'stile') THEN barrier ELSE NULL 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 ELSE NULL END
) AS feature,
access,
CASE WHEN amenity IN ('waste_basket', 'waste_disposal') THEN 2 ELSE 1 END AS prio
Expand All @@ -2557,7 +2557,7 @@ Layer:
OR amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking', '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')
OR barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block', 'log', 'cattle_grid', 'stile', 'motorcycle_barrier', 'cycle_barrier', 'full-height_turnstile', 'turnstile', 'kissing_gate')
ORDER BY prio
) AS amenity_low_priority
properties:
Expand All @@ -2573,12 +2573,12 @@ Layer:
way,
COALESCE(
'amenity_' || CASE WHEN amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking') THEN amenity ELSE NULL END,
'barrier_' || CASE WHEN barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block', 'log', 'cattle_grid', 'stile') THEN barrier ELSE NULL 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 ELSE NULL END
) AS feature,
access
FROM planet_osm_polygon p
WHERE amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking')
OR barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block', 'log', 'cattle_grid', 'stile')
OR barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block', 'log', 'cattle_grid', 'stile', 'motorcycle_barrier', 'cycle_barrier', 'full-height_turnstile', 'turnstile', 'kissing_gate')
) AS amenity_low_priority_poly
properties:
minzoom: 14
38 changes: 38 additions & 0 deletions symbols/barrier/cycle_barrier.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions symbols/barrier/full-height_turnstile.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions symbols/barrier/kissing_gate.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions symbols/barrier/motorcycle_barrier.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 6148df3

Please sign in to comment.