From 6148df368cd5a77392c1ab10c97b82063b58146d Mon Sep 17 00:00:00 2001 From: Adamant36 Date: Wed, 26 Dec 2018 15:48:20 -0800 Subject: [PATCH] add more barrier icons --- amenity-points.mss | 31 +++++++++++++++++- project.mml | 8 ++--- symbols/barrier/cycle_barrier.svg | 38 +++++++++++++++++++++++ symbols/barrier/full-height_turnstile.svg | 31 ++++++++++++++++++ symbols/barrier/kissing_gate.svg | 31 ++++++++++++++++++ symbols/barrier/motorcycle_barrier.svg | 31 ++++++++++++++++++ 6 files changed, 165 insertions(+), 5 deletions(-) create mode 100644 symbols/barrier/cycle_barrier.svg create mode 100644 symbols/barrier/full-height_turnstile.svg create mode 100644 symbols/barrier/kissing_gate.svg create mode 100644 symbols/barrier/motorcycle_barrier.svg diff --git a/amenity-points.mss b/amenity-points.mss index 040398d6da..5a63b42a6f 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -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; diff --git a/project.mml b/project.mml index 1a900395f9..eb69761bc1 100644 --- a/project.mml +++ b/project.mml @@ -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 @@ -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: @@ -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 diff --git a/symbols/barrier/cycle_barrier.svg b/symbols/barrier/cycle_barrier.svg new file mode 100644 index 0000000000..0002600db6 --- /dev/null +++ b/symbols/barrier/cycle_barrier.svg @@ -0,0 +1,38 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/symbols/barrier/full-height_turnstile.svg b/symbols/barrier/full-height_turnstile.svg new file mode 100644 index 0000000000..54b239a462 --- /dev/null +++ b/symbols/barrier/full-height_turnstile.svg @@ -0,0 +1,31 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/symbols/barrier/kissing_gate.svg b/symbols/barrier/kissing_gate.svg new file mode 100644 index 0000000000..c605fe9a4f --- /dev/null +++ b/symbols/barrier/kissing_gate.svg @@ -0,0 +1,31 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/symbols/barrier/motorcycle_barrier.svg b/symbols/barrier/motorcycle_barrier.svg new file mode 100644 index 0000000000..7139c299cc --- /dev/null +++ b/symbols/barrier/motorcycle_barrier.svg @@ -0,0 +1,31 @@ + + + + + + image/svg+xml + + + + + + + +