From cb6bd8820744ec83c52f543eb809bd7b437756a2 Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Sat, 23 Oct 2021 11:58:34 +0100
Subject: [PATCH] [classifier] Added barrier=chain/swing_gate.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 data/mapcss-mapping.csv                     |  4 +--
 data/strings/types_strings.txt              | 40 +++++++++++++++++++++
 data/styles/clear/include/Icons.mapcss      | 15 ++++----
 generator/generator_tests/osm_type_test.cpp |  2 ++
 4 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index c98628eec6..ed81f70eee 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -737,8 +737,8 @@ boundary|administrative|4|state;[boundary=administrative][admin_level=4][border_
 place|state|USA;[place=state][addr:country=US],[place=state][is_in=USA],[place=state][is_in:country=USA],[place=state][is_in:country_code=us];;name;int_name;737;
 building|address;[addr:housenumber][addr:street];;addr:housenumber;name;738;
 amenity|parking|no-access;[amenity=parking][access=no];;name;int_name;739;
-deprecated|deprecated;740;x
-deprecated|deprecated;741;x
+barrier|swing_gate;740;
+barrier|chain;741;
 deprecated|deprecated;742;x
 deprecated|deprecated;743;x
 deprecated|deprecated;744;x
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index 2d92d48c00..7beff48f15 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -3546,6 +3546,12 @@
     zh-Hans = 边境检查站
     zh-Hant = 邊境管制
 
+  [type.barrier.chain]
+    en = Chain
+    be = Ланцуг
+    ru = Цепь
+    uk = Ланцюг
+
   [type.barrier.city_wall]
     en = City Wall
     ja = 城壁
@@ -3648,6 +3654,7 @@
   [type.barrier.lift_gate]
     en = Lift Gate
     ar = حاجز بوابة
+    be = Шлагбаўм
     cs = Závora
     da = Bom
     de = Schranke
@@ -3718,6 +3725,39 @@
     zh-Hans = 台阶
     zh-Hant = 梯磴
 
+  [type.barrier.swing_gate]
+    en = Swing Gate
+    ar = حاجز بوابة
+    be = Шлагбаўм
+    cs = Závora
+    da = Bom
+    de = Schranke
+    el = Ανυψούμενη μπάρα
+    es = Barrera
+    fa = اسانسور
+    fi = Puomi
+    fr = Barrière levante
+    hu = Sorompó
+    id = Polisi tidur
+    it = Barriera ferroviaria
+    ja = ブームバリア
+    ko = 차량차단기
+    nb = Bom
+    nl = Slagboom
+    pl = Szlaban
+    pt = Cancela elevatória
+    pt-BR = Cancela
+    ro = Barieră cu braț
+    ru = Шлагбаум
+    sk = Závora
+    sv = Bom
+    th = ไม้กั้น
+    tr = Barrière levante
+    uk = Шлагбаум
+    vi = Thanh Chắn
+    zh-Hans = 道闸
+    zh-Hant = 遮斷機
+
   [type.barrier.toll_booth]
     en = Toll Booth
     ar = كشك رسوم عبور
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index e33e633286..2c32016f5c 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -1593,8 +1593,10 @@ node|z16-[leisure=water_park],
 area|z16-[leisure=water_park],
 line|z16-[barrier=block],
 line|z16-[barrier=bollard],
+line|z16-[barrier=chain],
 line|z16-[barrier=entrance],
 line|z16-[barrier=gate],
+line|z16-[barrier=lift_gate],
 line|z16-[barrier=swing_gate],
 line|z16-[barrier=stile],
 node|z16-[amenity=nightclub],
@@ -1603,8 +1605,6 @@ node|z16-[amenity=bank],
 area|z16-[amenity=bank],
 node|z16-[amenity=taxi],
 area|z16-[amenity=taxi],
-node|z16-[barrier=lift_gate],
-area|z16-[barrier=lift_gate],
 node|z16-[leisure=dog_park],
 area|z16-[leisure=dog_park],
 node|z16-[leisure=water_park],
@@ -2064,11 +2064,12 @@ area|z15-[barrier=toll_booth]
 
 node|z15-[barrier=border_control]
 {icon-image:bcontrol-m.svg;}
+
 line|z16-[barrier=block],
 line|z16-[barrier=bollard],
+line|z16-[barrier=chain],
 line|z16-[barrier=entrance],
 line|z16-[barrier=gate],
-line|z16-[barrier=swing_gate],
 line|z16-[barrier=stile],
 {icon-image: dot-m.svg;font-size: 11;}
 
@@ -2083,11 +2084,11 @@ node|z17-[amenity=taxi],
 area|z17-[amenity=taxi]
 {icon-min-distance: 20;}
 
-node|z16-[barrier=lift_gate],
-area|z16-[barrier=lift_gate]
+line|z16-[barrier=lift_gate],
+line|z16-[barrier=swing_gate],
 {icon-image: lift_gate-m.svg;icon-min-distance: 30;}
-node|z17-[barrier=lift_gate],
-area|z17-[barrier=lift_gate]
+line|z17-[barrier=lift_gate],
+line|z17-[barrier=swing_gate],
 {icon-min-distance: 20;text-optional: true;}
 
 node|z16-[leisure=dog_park],
diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index 4e4865a586..e9ff84bc79 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -1446,6 +1446,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
     {"barrier", "block"},
     {"barrier", "bollard"},
     {"barrier", "border_control"},
+    {"barrier", "chain"},
     {"barrier", "city_wall"},
     {"barrier", "entrance"},
     {"barrier", "fence"},
@@ -1454,6 +1455,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
     {"barrier", "lift_gate"},
     {"barrier", "retaining_wall"},
     {"barrier", "stile"},
+    {"barrier", "swing_gate"},
     {"barrier", "toll_booth"},
     {"barrier", "wall"},
     {"boundary", "national_park"},