[classifier] Replaced obsolete amenity=embassy with office=diplomatic.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>

data/categories.txt

@@ -5920,7 +5920,7 @@ sk:3policajná stanica
 fa:کلانتری|اگاهی
 el:Αστυνομία
 
-amenity-embassy
+office-diplomatic
 en:4Embassy
 ru:4Посольство
 bg:Посолство|Консолство

data/editor.config

@@ -226,7 +226,7 @@
       <type id="amenity-drinking_water">
         <include field="name" />
       </type>
-      <type id="amenity-embassy">
+      <type id="office-diplomatic">
         <include group="poi" />
       </type>
       <type id="amenity-fast_food" group="food">

data/mapcss-mapping.csv

@@ -699,14 +699,14 @@ deprecated|deprecated;698;x
 deprecated|deprecated;699;x
 deprecated|deprecated;700;x
 deprecated|deprecated;701;x
-deprecated|deprecated;702;x
+office|diplomatic;702;
 railway|station|subway;[railway=station][transport=subway],[railway=station][station=subway];;name;int_name;703;
 amenity|police;704;
 amenity|car_rental;705;
 amenity|taxi;706;
 amenity|marketplace;707;
 amenity|nightclub;708;
-amenity|embassy;709;
+amenity|embassy;709;office|diplomatic
 amenity|townhall;710;
 barrier|gate;711;
 barrier|lift_gate;712;

data/strings/types_strings.txt

@@ -1101,7 +1101,7 @@
     zh-Hans = 驾校
     zh-Hant = 駕訓班
 
-  [type.amenity.embassy]
+  [type.office.diplomatic]
     en = Embassy
     ar = سفارة
     cs = Velvyslanectví

data/styles/clear/include/Icons.mapcss

@@ -275,8 +275,8 @@ node[amenity=police],
 area[amenity=police],
 node[amenity=prison],
 area[amenity=prison],
-node[amenity=embassy],
-area[amenity=embassy],
+node[office=diplomatic],
+area[office=diplomatic],
 node[office=lawyer],
 area[office=lawyer]
 {z-index: 2600;}
@@ -1624,8 +1624,8 @@ node|z17-[amenity=police],
 area|z17-[amenity=police],
 node|z17-[amenity=prison],
 area|z17-[amenity=prison],
-node|z17-[amenity=embassy],
-area|z17-[amenity=embassy],
+node|z17-[office=diplomatic],
+area|z17-[office=diplomatic],
 node|z17-[office=lawyer],
 area|z17-[office=lawyer],
 node|z17-[vending=parking_tickets],
@@ -2128,11 +2128,11 @@ node|z18-[amenity=prison],
 area|z18-[amenity=prison]
 {font-size: 11;text-optional: true;}
 
-node|z17-[amenity=embassy],
-area|z17-[amenity=embassy]
+node|z17-[office=diplomatic],
+area|z17-[office=diplomatic]
 {icon-image: embassy-m.svg;text-optional: true;}
-node|z18-[amenity=embassy],
-area|z18-[amenity=embassy]
+node|z18-[office=diplomatic],
+area|z18-[office=diplomatic]
 {font-size: 11;text-optional: true;}
 
 node|z17-[amenity=bicycle_rental],

generator/generator_tests/osm_type_test.cpp

@@ -1388,7 +1388,6 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
     {"amenity", "doctors"},
     {"amenity", "drinking_water"},
     {"amenity", "driving_school"},
-    {"amenity", "embassy"},
     {"amenity", "fast_food"},
     {"amenity", "ferry_terminal"},
     {"amenity", "fire_station"},
@@ -1682,6 +1681,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
     {"natural", "water"},
     {"natural", "wetland"},
     {"office", "company"},
+    {"office", "diplomatic"},
     {"office", "estate_agent"},
     {"office", "government"},
     {"office", "insurance"},

map/bookmark_helpers.cpp

@@ -51,7 +51,6 @@ std::map<std::string, BookmarkMatchInfo> const kFeatureTypeToBookmarkMatchInfo =
 
   {"amenity-college", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
   {"amenity-courthouse", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
-  {"amenity-embassy", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
   {"amenity-kindergarten", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
   {"amenity-library", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
   {"amenity-police", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
@@ -59,6 +58,7 @@ std::map<std::string, BookmarkMatchInfo> const kFeatureTypeToBookmarkMatchInfo =
   {"amenity-school", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
   {"building-university", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
   {"office", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
+  {"office-diplomatic", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
   {"office-lawyer", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
 
   {"amenity-grave_yard-christian", {kml::BookmarkIcon::Christianity, BookmarkBaseType::ReligiousPlace}},