From e3ea3e84445b2783c2a68137a841b2e17cc469d2 Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Fri, 1 Oct 2021 08:08:05 +0200
Subject: [PATCH] [styles] Removed deprecated historic=museum.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 data/mapcss-mapping.csv                     | 2 +-
 data/strings/types_strings.txt              | 8 --------
 data/styles/clear/include/Icons.mapcss      | 4 ----
 data/styles/vehicle/include/Icons.mapcss    | 4 ----
 generator/generator_tests/osm_type_test.cpp | 1 -
 indexer/ftypes_matcher.cpp                  | 1 -
 search/model.cpp                            | 1 -
 7 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 99299f1046..20df9a82a3 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -403,7 +403,7 @@ piste:type|sled;402;
 leisure|beach_resort;403;
 leisure|dog_park;404;
 aerialway|gondola;405;
-historic|museum;406;
+historic|museum;[historic=museum];x;name;int_name;406;tourism|museum
 highway|living_street|bridge;[highway=living_street][bridge?];;name;int_name;407;
 deprecated|deprecated;408;x
 railway|monorail;409;
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index c0c22c92b2..d6ea4d5909 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -10877,14 +10877,6 @@
     zh-Hans = 纪念堂
     zh-Hant = 紀念碑
 
-  [type.historic.museum]
-    en = historic-museum
-    ja = 歴史的なミュージアム
-    pl = Muzeum historyczne
-    pt = Museu
-    pt-BR = Museu
-    zh-Hans = 历史博物馆
-
   [type.historic.ruins]
     en = Ruins
     ar = آثار
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 86d24b1aca..cc1b85b856 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -1130,8 +1130,6 @@ node|z16-[historic=ship],
 area|z16-[historic=ship],
 node|z16-[historic=tomb],
 area|z16-[historic=tomb],
-node|z16-[historic=museum],
-area|z16-[historic=museum],
 node|z17-[historic=ruins],
 area|z17-[historic=ruins],
 node|z17-[historic=wayside_shrine],
@@ -1200,8 +1198,6 @@ area|z15[tourism=museum]
 {icon-image: museum-m.svg;icon-min-distance: 24;}
 node|z16-[tourism=museum],
 area|z16-[tourism=museum],
-node|z16-[historic=museum],
-area|z16-[historic=museum]
 {icon-image: museum-m.svg;text-offset: 1;icon-min-distance: 12;}
 
 node|z15[tourism=gallery]
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index e0ddb4161e..90a10a1fca 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -482,8 +482,6 @@ node|z16-[historic=ship],
 area|z16-[historic=ship],
 node|z16-[historic=tomb],
 area|z16-[historic=tomb],
-node|z16-[historic=museum],
-area|z16-[historic=museum],
 node|z17-[historic=ruins],
 area|z17-[historic=ruins],
 node|z17-[historic=wayside_shrine],
@@ -555,8 +553,6 @@ area|z15[tourism=museum]
 {icon-image: museum-m.svg;icon-min-distance: 24;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 node|z16-[tourism=museum],
 area|z16-[tourism=museum],
-node|z16-[historic=museum],
-area|z16-[historic=museum]
 {icon-image: museum-m.svg;text-offset: 1;icon-min-distance: 12;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 
 node|z15[tourism=gallery]
diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index 9521fb62a6..af2a00542f 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -1589,7 +1589,6 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
     {"historic", "fort"},
     {"historic", "memorial"},
     {"historic", "monument"},
-    {"historic", "museum"},
     {"historic", "ruins"},
     {"historic", "ship"},
     {"historic", "tomb"},
diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp
index 025c24269b..0720ce57a8 100644
--- a/indexer/ftypes_matcher.cpp
+++ b/indexer/ftypes_matcher.cpp
@@ -474,7 +474,6 @@ AttractionsChecker::AttractionsChecker() : BaseChecker(2 /* level */)
       {"historic", "fort"},
       {"historic", "memorial"},
       {"historic", "monument"},
-      {"historic", "museum"},
       {"historic", "ruins"},
       {"historic", "ship"},
       {"historic", "tomb"},
diff --git a/search/model.cpp b/search/model.cpp
index 1e6263590e..5c4224a895 100644
--- a/search/model.cpp
+++ b/search/model.cpp
@@ -88,7 +88,6 @@ class IsComplexPoiChecker : public ftypes::BaseChecker
                                           {"historic", "archaeological_site"},
                                           {"historic", "castle"},
                                           {"historic", "fort"},
-                                          {"historic", "museum"},
                                           {"landuse", "cemetery"},
                                           {"landuse", "churchyard"},
                                           {"landuse", "commercial"},