From 8a32d0b8fe6c9a808ed1fd767734b2bf1ebbabe8 Mon Sep 17 00:00:00 2001 From: Ilya Zverev Date: Wed, 7 Oct 2015 20:14:41 +0300 Subject: [PATCH] [styles] Add barrier=border_control to classificator --- data/classificator.txt | 1 + data/drules_proto.bin | Bin 205719 -> 205817 bytes data/drules_proto.txt | 31 +++++++++++++++++++ data/mapcss-mapping.csv | 1 + data/styles/legacy/include/base_other.mapcss | 2 ++ data/types.txt | 1 + data/visibility.txt | 1 + 7 files changed, 37 insertions(+) diff --git a/data/classificator.txt b/data/classificator.txt index aef28b6a39..aed265b3c8 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -110,6 +110,7 @@ world + barrier + block - bollard - + border_control - city_wall - cycle_barrier - entrance - diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 0ddcb20eb1446a613739b1e6f4dd5ed36c65ba34..417461461e3e2f548470aae410dd300b83c59e95 100644 GIT binary patch delta 52 zcmbP!oag6po()UwBonyAk`jxGGE<9mlk$sFQj6k~^YcoI@^dC{a`0?kYS+Hhj&b`^ IJEl)h07H%zW&i*H delta 22 ecmex)oM-xRo()Uwn%V8!+3gv(v)eO$dIA7)I0-fY diff --git a/data/drules_proto.txt b/data/drules_proto.txt index a3a40218fe..3c4d57c4c0 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -5507,6 +5507,37 @@ cont { } } } +cont { + name: "barrier-border_control" + element { + scale: 16 + symbol { + name: "barrier" + priority: 16000 + } + } + element { + scale: 17 + symbol { + name: "barrier" + priority: 16000 + } + } + element { + scale: 18 + symbol { + name: "barrier" + priority: 16000 + } + } + element { + scale: 19 + symbol { + name: "barrier" + priority: 16000 + } + } +} cont { name: "barrier-city_wall" element { diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 6c1ce39f9f..910e598c74 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1036,3 +1036,4 @@ aerialway|drag_lift;[aerialway=drag_lift];;name;int_name;1035; amenity|dentist;[amenity=dentist];;name;int_name;1036; amenity|clinic;[amenity=clinic];;name;int_name;1037; barrier|entrance;[barrier=entrance];;name;int_name;1038; +barrier|border_control;[barrier=border_control];;name;int_name;1039; diff --git a/data/styles/legacy/include/base_other.mapcss b/data/styles/legacy/include/base_other.mapcss index 02268a5f27..a432bc7fbd 100644 --- a/data/styles/legacy/include/base_other.mapcss +++ b/data/styles/legacy/include/base_other.mapcss @@ -850,6 +850,8 @@ line|z16[communication=line] } area|z16-[barrier=lift_gate], node|z16-[barrier=lift_gate] +area|z16-[barrier=border_control], +node|z16-[barrier=border_control] { icon-image: barrier.svg; } diff --git a/data/types.txt b/data/types.txt index 2cf812f9b9..415dc537de 100644 --- a/data/types.txt +++ b/data/types.txt @@ -1036,3 +1036,4 @@ aerialway|drag_lift amenity|dentist amenity|clinic barrier|entrance +barrier|border_control diff --git a/data/visibility.txt b/data/visibility.txt index 0143b05b16..1d5aadb23c 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -110,6 +110,7 @@ world 00000000000000000000 + barrier 00000000000000000000 + block 00000000000000001111 - bollard 00000000000000001111 - + border_control 00000000000000001111 - city_wall 00000000000000001111 - cycle_barrier 00000000000000000000 - entrance 00000000000000000111 -