From cf8b7acd3ed42067d3d294ae27ff739a014ed82c Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Tue, 7 Jun 2022 13:15:19 +0300
Subject: [PATCH] [classifier] Replaced deprecated waterway-lock with
 natural-water-lock.

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

diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 535510446e..ef3aee3c24 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -495,8 +495,8 @@ deprecated|deprecated;494;x
 amenity|parking|park_and_ride;[amenity=parking][parking=park_and_ride];;name;int_name;495;
 deprecated|deprecated;496;x
 deprecated|deprecated;497;x
-deprecated|deprecated;498;x
-waterway|lock;499;
+natural|water|lock;[natural=water][water=lock];;name;int_name;498;
+waterway|lock;499;waterway|canal
 deprecated|deprecated;500;x
 deprecated|deprecated;501;x
 deprecated|deprecated;502;x
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index 5c4a2a701b..b8c8ef87ea 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -12638,6 +12638,43 @@
     zh-Hans = 湖
     zh-Hant = 湖泊
 
+  [type.natural.water.lock]
+    en = Lock Chamber
+    ar = ﻞﻔﻘﻟﺍ ﺔﻓﺮﻏ
+    be = Шлюзавая камера
+    bg = Заключваща камера
+    cs = Zámková komora
+    da = Låsekammer
+    de = Schleusenkammer
+    el = Θάλαμος κλειδαριάς
+    es = Cámara de bloqueo
+    eu = Sarraila Ganbera
+    fa = ﻞﻔﻗ ﻕﺎﺗﺍ
+    fi = Lukko kammio
+    fr = Chambre de verrouillage
+    he = לוענמ את
+    hu = Zsilipkamra
+    id = Ruang Kunci
+    it = Camera di blocco
+    ja = ロックチャンバー
+    ko = 잠금 챔버
+    nb = Låsekammer
+    nl = Slotkamer
+    pl = Komora zamka
+    pt = Câmara de Bloqueio
+    pt-BR = Câmara de Bloqueio
+    ro = Camera de blocare
+    ru = Шлюзовая камера
+    sk = Uzamykacia komora
+    sv = Låskammare
+    sw = Chumba cha kufuli
+    th = ห้องล็อค
+    tr = Kilit Odası
+    uk = Замкова камера
+    vi = Khoang khóa
+    zh-Hans = 锁室
+    zh-Hant = 鎖室
+
   [type.natural.water.pond]
     en = Pond
     ar = بركة
@@ -19705,16 +19742,6 @@
     uk = Водовiдвiд
     zh-Hans = 渠
 
-  [type.waterway.lock]
-    en = Waterway Lock
-    de = Schleuse
-    fr = Écluse
-    pt = Eclusa
-    pt-BR = Eclusa
-    ru = Шлюз
-    tr = Kanal Havuzu
-    uk = Шлюз
-
   [type.waterway.lock_gate]
     en = Lock Gate
     ar = بوابة هويس
diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss
index 3cc9b8ba6b..330fc3ecd5 100644
--- a/data/styles/clear/include/Basemap.mapcss
+++ b/data/styles/clear/include/Basemap.mapcss
@@ -127,7 +127,6 @@ line[waterway=riverbank],
 line[waterway=stream],
 line[waterway=canal],
 line[natural=strait],
-line[waterway=lock],
 line[waterway=ditch],
 line[waterway=drain],
 {z-index: 50;}
@@ -360,7 +359,6 @@ line|z13-[waterway=stream],
 line|z13-[waterway=stream][intermittent=yes],
 line|z13-[waterway=canal],
 line|z13-[natural=strait],
-line|z16-[waterway=lock],
 {opacity: 1;color: @river;-x-me-line-priority: -15600;}
 
 /* 6.1 Area water(lake,pond etc.) */
@@ -418,8 +416,6 @@ line|z15-[natural=strait],
 line|z15-[waterway=stream][intermittent=yes]
 {width: 1.4;dashes: 4.95,4.95;}
 
-line|z16-[waterway=lock],
-{width: 1.5;}
 node|z16-[waterway=lock_gate],
 {icon-image: dot-m.svg;}
 
diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss
index f2d991eb13..0900e48243 100644
--- a/data/styles/vehicle/include/Basemap.mapcss
+++ b/data/styles/vehicle/include/Basemap.mapcss
@@ -113,7 +113,6 @@ line[waterway=riverbank],
 line[waterway=stream],
 line[waterway=canal],
 line[natural=strait],
-line[waterway=lock],
 line[waterway=ditch],
 line[waterway=drain],
 {z-index: 50;}
@@ -328,7 +327,6 @@ line|z10-[waterway=river],
 line|z10-[waterway=riverbank],
 line|z13-[waterway=canal],
 line|z13-[natural=strait],
-line|z16-[waterway=lock],
 {opacity: 1;color: @river;}
 
 /* 6.1 Area water(lake,pond etc.) */
@@ -385,8 +383,6 @@ line|z15-[natural=strait],
 line|z15-[waterway=stream][intermittent=yes]
 {width: 1.4;dashes: 4.95,4.95;}*/
 
-line|z16-[waterway=lock],
-{width: 1.5;}
 node|z16-[waterway=lock_gate],
 {icon-image: dot-m.svg;}
 
diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index bdb8b6a775..64b2661591 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -2066,7 +2066,6 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
     {"waterway", "ditch"},
     {"waterway", "dock"},
     {"waterway", "drain"},
-    {"waterway", "lock"},
     {"waterway", "lock_gate"},
     {"waterway", "river"},
     {"waterway", "riverbank"},
@@ -2296,6 +2295,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke)
     {{"natural", "water", "reservoir"}, {{"natural", "water"}, {"water", "reservoir"}}},
     {{"natural", "water", "river"}, {{"natural", "water"}, {"water", "river"}}},
     {{"natural", "water", "basin"}, {{"natural", "water"}, {"water", "basin"}}},
+    {{"natural", "water", "lock"}, {{"natural", "water"}, {"water", "lock"}}},
     {{"natural", "wetland", "bog"}, {{"natural", "wetland"}, {"wetland", "bog"}}},
     {{"natural", "wetland", "marsh"}, {{"natural", "wetland"}, {"wetland", "marsh"}}},
     {{"office"}, {{"office", "any_value"}}},