editor/editor_tests/xml_feature_test.cpp

@@ -459,3 +459,24 @@ UNIT_TEST(XMLFeature_AmenityRecyclingFromAndToXml)
   }
   */
 }
+
+UNIT_TEST(XMLFeature_Diet)
+{
+  XMLFeature ft(XMLFeature::Type::Node);
+  TEST(ft.GetCuisine().empty(), ());
+
+  ft.SetCuisine("vegan;vegetarian");
+  TEST_EQUAL(ft.GetCuisine(), "vegan;vegetarian", ());
+
+  ft.SetCuisine("vegan;pasta;vegetarian");
+  TEST_EQUAL(ft.GetCuisine(), "pasta;vegan;vegetarian", ());
+
+  ft.SetCuisine("vegetarian");
+  TEST_EQUAL(ft.GetCuisine(), "vegetarian", ());
+
+  ft.SetCuisine("vegan");
+  TEST_EQUAL(ft.GetCuisine(), "vegan", ());
+
+  ft.SetCuisine("");
+  TEST_EQUAL(ft.GetCuisine(), "", ());
+}

editor/xml_feature.cpp

@@ -28,14 +28,21 @@ constexpr char const * kIndex = "mwm_file_index";
 constexpr char const * kUploadTimestamp = "upload_timestamp";
 constexpr char const * kUploadStatus = "upload_status";
 constexpr char const * kUploadError = "upload_error";
-constexpr char const * kHouseNumber = "addr:housenumber";
-constexpr char const * kCuisine = "cuisine";
+
+string_view constexpr kHouseNumber = "addr:housenumber";
+string_view constexpr kCuisine = "cuisine";
+string_view constexpr kDietVegetarian = "diet:vegetarian";
+string_view constexpr kDietVegan = "diet:vegan";
+string_view constexpr kVegetarian = "vegetarian";
+string_view constexpr kVegan = "vegan";
+string_view constexpr kYes = "yes";
 
 constexpr char const * kUnknownType = "unknown";
 constexpr char const * kNodeType = "node";
 constexpr char const * kWayType = "way";
 constexpr char const * kRelationType = "relation";
 
+
 pugi::xml_node FindTag(pugi::xml_document const & document, string_view k)
 {
   string key = "//tag[@k='";
@@ -300,9 +307,69 @@ string XMLFeature::GetHouse() const { return GetTagValue(kHouseNumber); }
 
 void XMLFeature::SetHouse(string const & house) { SetTagValue(kHouseNumber, house); }
 
-string XMLFeature::GetCuisine() const { return GetTagValue(kCuisine); }
+/// https://github.com/organicmaps/organicmaps/issues/1118
+/// @todo Make full diet:xxx support.
+/// @{
+string XMLFeature::GetCuisine() const
+{
+  auto res = GetTagValue(kCuisine);
+  auto const appendCuisine = [&res](std::string_view s)
+  {
+    if (!res.empty())
+      res += ';';
+    res += s;
+  };
 
-void XMLFeature::SetCuisine(string const & cuisine) { SetTagValue(kCuisine, cuisine); }
+  if (GetTagValue(kDietVegan) == kYes)
+    appendCuisine(kVegan);
+  if (GetTagValue(kDietVegetarian) == kYes)
+    appendCuisine(kVegetarian);
+  return res;
+}
+
+void XMLFeature::SetCuisine(string cuisine)
+{
+  auto const findAndErase = [&cuisine](std::string_view s)
+  {
+    size_t const i = cuisine.find(s);
+    if (i != std::string_view::npos)
+    {
+      size_t from = 0;
+      size_t sz = s.size();
+      if (i > 0)
+      {
+        from = i - 1;
+        ASSERT_EQUAL(cuisine[from], ';', ());
+        ++sz;
+      }
+      else if (cuisine.size() > sz)
+      {
+        ASSERT_EQUAL(cuisine[sz], ';', ());
+        ++sz;
+      }
+
+      cuisine.erase(from, sz);
+      return true;
+    }
+    return false;
+  };
+
+  if (findAndErase(kVegan))
+    SetTagValue(kDietVegan, kYes);
+  else
+    RemoveTag(kDietVegan);
+
+  if (findAndErase(kVegetarian))
+    SetTagValue(kDietVegetarian, kYes);
+  else
+    RemoveTag(kDietVegetarian);
+
+  if (!cuisine.empty())
+    SetTagValue(kCuisine, cuisine);
+  else
+    RemoveTag(kCuisine);
+}
+/// @}
 
 time_t XMLFeature::GetModificationTime() const
 {
@@ -379,6 +446,13 @@ void XMLFeature::SetTagValue(string_view key, string_view value)
   }
 }
 
+void XMLFeature::RemoveTag(string_view key)
+{
+  auto tag = FindTag(m_document, key);
+  if (tag)
+    GetRootNode().remove_child(tag);
+}
+
 string XMLFeature::GetAttribute(string const & key) const
 {
   return GetRootNode().attribute(key.data()).value();
@@ -518,7 +592,7 @@ XMLFeature ToXML(osm::EditableMapObject const & object, bool serializeType)
         if (toFeature.GetTagValue(k).empty())
           toFeature.SetTagValue(k, *iter);
         else
-          toFeature.SetTagValue(*iter, "yes");
+          toFeature.SetTagValue(*iter, kYes);
       }
       else
       {

editor/xml_feature.hpp

@@ -141,7 +141,7 @@ public:
   void SetHouse(std::string const & house);
 
   std::string GetCuisine() const;
-  void SetCuisine(std::string const & cuisine);
+  void SetCuisine(std::string cuisine);
 
   /// Our and OSM modification time are equal.
   time_t GetModificationTime() const;
@@ -177,6 +177,7 @@ public:
 
   std::string GetTagValue(std::string_view key) const;
   void SetTagValue(std::string_view key, std::string_view value);
+  void RemoveTag(std::string_view key);
 
   std::string GetAttribute(std::string const & key) const;
   void SetAttribute(std::string const & key, std::string const & value);

indexer/feature.cpp

@@ -802,10 +802,10 @@ string_view FeatureType::GetName(int8_t lang)
 
   ParseCommon();
 
-  // We don't store empty names.
+  // We don't store empty names. UPD: We do for coast features :)
   string_view name;
   if (m_params.name.GetString(lang, name))
-    ASSERT(!name.empty(), ());
+    ASSERT(!name.empty() || m_id.m_mwmId.GetInfo()->GetType() == MwmInfo::COASTS, ());
 
   return name;
 }