From 35852fdd7679d4756c66933eeb508fffdcaa15c5 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste CHARRON <jeanbaptiste.charron@outlook.fr>
Date: Wed, 1 Feb 2023 19:59:09 +0100
Subject: [PATCH 1/7] Replace mapsme by omaps in editor

Signed-off-by: Jean-Baptiste CHARRON <jeanbaptiste.charron@outlook.fr>
---
 data/config.xsd                            | 4 ++--
 data/editor.config                         | 2 +-
 editor/editor_config.cpp                   | 6 +++---
 editor/editor_tests/config_loader_test.cpp | 6 +++---
 editor/editor_tests/osm_editor_test.cpp    | 2 +-
 editor/osm_editor.cpp                      | 1 +
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/data/config.xsd b/data/config.xsd
index 4e6d31456a..d9010f5247 100644
--- a/data/config.xsd
+++ b/data/config.xsd
@@ -8,10 +8,10 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:element name="mapsme">
+  <xs:element name="omaps">
     <xs:annotation>
       <xs:documentation>
-        The root element, "mapsme", for now contains only one entry, "editor".
+        The root element, "omaps", for now contains only one entry, "editor".
       </xs:documentation>
     </xs:annotation>
 
diff --git a/data/editor.config b/data/editor.config
index 045f987e90..51b9a726d3 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<mapsme>
+<omaps>
   <!-- After editing, validate this with
        xmllint -noout -schema config.xsd editor.config
        (only use double dashes for schema and noout)
diff --git a/editor/editor_config.cpp b/editor/editor_config.cpp
index fbc2f22221..e638f00148 100644
--- a/editor/editor_config.cpp
+++ b/editor/editor_config.cpp
@@ -83,7 +83,7 @@ bool TypeDescriptionFromXml(pugi::xml_node const & root, pugi::xml_node const &
     auto const node = xNode.node();
     std::string const groupName = node.attribute("group").value();
 
-    std::string const xpath = "/mapsme/editor/fields/field_group[@name='" + groupName + "']";
+    std::string const xpath = "/omaps/editor/fields/field_group[@name='" + groupName + "']";
     auto const group = root.select_node(xpath.data()).node();
     ASSERT(group, ("No such group", groupName));
 
@@ -110,7 +110,7 @@ bool TypeDescriptionFromXml(pugi::xml_node const & root, pugi::xml_node const &
 std::vector<pugi::xml_node> GetPrioritizedTypes(pugi::xml_node const & node)
 {
   std::vector<pugi::xml_node> result;
-  for (auto const & xNode : node.select_nodes("/mapsme/editor/types/type[@id]"))
+  for (auto const & xNode : node.select_nodes("/omaps/editor/types/type[@id]"))
     result.push_back(xNode.node());
   stable_sort(begin(result), end(result),
               [](pugi::xml_node const & lhs, pugi::xml_node const & rhs) {
@@ -164,7 +164,7 @@ bool EditorConfig::GetTypeDescription(std::vector<std::string> classificatorType
 std::vector<std::string> EditorConfig::GetTypesThatCanBeAdded() const
 {
   auto const xpathResult =
-      m_document.select_nodes("/mapsme/editor/types/type[not(@can_add='no' or @editable='no')]");
+      m_document.select_nodes("/omaps/editor/types/type[not(@can_add='no' or @editable='no')]");
 
   std::vector<std::string> result;
   for (auto const & xNode : xpathResult)
diff --git a/editor/editor_tests/config_loader_test.cpp b/editor/editor_tests/config_loader_test.cpp
index 1718b3ef52..b100b57bc9 100644
--- a/editor/editor_tests/config_loader_test.cpp
+++ b/editor/editor_tests/config_loader_test.cpp
@@ -16,11 +16,11 @@ using platform::tests_support::ScopedFile;
 
 void CheckGeneralTags(pugi::xml_document const & doc)
 {
-  auto const types = doc.select_nodes("/mapsme/editor/types");
+  auto const types = doc.select_nodes("/omaps/editor/types");
   TEST(!types.empty(), ());
-  auto const fields = doc.select_nodes("/mapsme/editor/fields");
+  auto const fields = doc.select_nodes("/omaps/editor/fields");
   TEST(!fields.empty(), ());
-  auto const preferred_types = doc.select_nodes("/mapsme/editor/preferred_types");
+  auto const preferred_types = doc.select_nodes("/omaps/editor/preferred_types");
   TEST(!preferred_types.empty(), ());
 }
 
diff --git a/editor/editor_tests/osm_editor_test.cpp b/editor/editor_tests/osm_editor_test.cpp
index e8f253250d..8763beba7d 100644
--- a/editor/editor_tests/osm_editor_test.cpp
+++ b/editor/editor_tests/osm_editor_test.cpp
@@ -162,7 +162,7 @@ void GenerateUploadedFeature(MwmSet::MwmId const & mwmId,
                              osm::EditableMapObject const & emo,
                              pugi::xml_document & out)
 {
-  pugi::xml_node root = out.append_child("mapsme");
+  pugi::xml_node root = out.append_child("omaps");
   root.append_attribute("format_version") = 1;
 
   pugi::xml_node mwmNode = root.append_child("mwm");
diff --git a/editor/osm_editor.cpp b/editor/osm_editor.cpp
index 5aaa51f31b..8c796d4635 100644
--- a/editor/osm_editor.cpp
+++ b/editor/osm_editor.cpp
@@ -41,6 +41,7 @@ using std::move, std::make_shared, std::string;
 
 namespace
 {
+// Do not change, this is tags in edits.xml
 constexpr char const * kXmlRootNode = "mapsme";
 constexpr char const * kXmlMwmNode = "mwm";
 constexpr char const * kDeleteSection = "delete";
-- 
2.45.3


From 315aed3bddbf0deb1b56ef0572d5f26819a8acf8 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste CHARRON <jeanbaptiste.charron@outlook.fr>
Date: Wed, 1 Feb 2023 20:00:43 +0100
Subject: [PATCH 2/7] [editor] Added load test for existing edits.xml.

Signed-off-by: Jean-Baptiste CHARRON <jeanbaptiste.charron@outlook.fr>
---
 editor/editor_tests/osm_editor_test.cpp | 39 +++++++++++++++++++++++++
 editor/editor_tests/osm_editor_test.hpp |  1 +
 2 files changed, 40 insertions(+)

diff --git a/editor/editor_tests/osm_editor_test.cpp b/editor/editor_tests/osm_editor_test.cpp
index 8763beba7d..a54d7848e5 100644
--- a/editor/editor_tests/osm_editor_test.cpp
+++ b/editor/editor_tests/osm_editor_test.cpp
@@ -1327,6 +1327,43 @@ bool EditorTest::RemoveMwm(MwmSet::MwmId const & mwmId)
   m_mwmFiles.erase(it);
   return true;
 }
+
+void EditorTest::LoadExistingEditsXml()
+{
+  char const * data = R"(
+    <?xml version="1.0"?>
+    <mapsme format_version="1">
+      <mwm name="TestCountry" version="221119">
+        <delete />
+        <modify />
+        <create>
+          <node lat="54.0446163" lon="27.6597626" mwm_file_index="4293918720" timestamp="2022-12-09T18:58:28Z">
+            <tag k="name:ru" v="xxx" />
+            <tag k="amenity" v="bar" />
+          </node>
+        </create>
+        <obsolete />
+      </mwm>
+    </mapsme>
+  )";
+
+  ConstructTestMwm([](editor::testing::TestMwmBuilder &)
+  {
+  });
+
+  pugi::xml_document doc;
+  TEST(doc.load(data), ());
+
+  auto memStorage = std::make_unique<editor::InMemoryStorage>();
+  memStorage->Save(doc);
+
+  auto & editor = osm::Editor::Instance();
+  editor.SetStorageForTesting(std::move(memStorage));
+
+  editor.LoadEdits();
+  TEST_EQUAL(editor.m_features.Get()->size(), 1, ());
+}
+
 }  // namespace testing
 }  // namespace editor
 
@@ -1427,4 +1464,6 @@ UNIT_CLASS_TEST(EditorTest, SaveEditedFeatureTest)
 }
 
 UNIT_CLASS_TEST(EditorTest, SaveTransactionTest) { EditorTest::SaveTransactionTest(); }
+
+UNIT_CLASS_TEST(EditorTest, LoadEditsXml) { LoadExistingEditsXml(); }
 }  // namespace
diff --git a/editor/editor_tests/osm_editor_test.hpp b/editor/editor_tests/osm_editor_test.hpp
index 0c4407f544..d6e33a1cbb 100644
--- a/editor/editor_tests/osm_editor_test.hpp
+++ b/editor/editor_tests/osm_editor_test.hpp
@@ -46,6 +46,7 @@ public:
   void LoadMapEditsTest();
   void SaveEditedFeatureTest();
   void SaveTransactionTest();
+  void LoadExistingEditsXml();
 
 private:
   template <typename BuildFn>
-- 
2.45.3


From c0cc1aa531e70e7d037be113caa816f1f41239d9 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Thu, 2 Feb 2023 15:58:10 +0100
Subject: [PATCH 3/7] Fixed not renamed tag

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 data/editor.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/editor.config b/data/editor.config
index 51b9a726d3..210ba5a081 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -1181,4 +1181,4 @@
       <type id="highway-bus_stop" />
     </preferred_types>
   </editor>
-</mapsme>
+</omaps>
-- 
2.45.3


From 9c26b3e9b0da841baf5a343d01c8ff4667af1cb4 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Thu, 2 Feb 2023 16:01:03 +0100
Subject: [PATCH 4/7] [editor] Properly load older edits.xml file

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 editor/osm_editor.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/editor/osm_editor.cpp b/editor/osm_editor.cpp
index 8c796d4635..7b58faf214 100644
--- a/editor/osm_editor.cpp
+++ b/editor/osm_editor.cpp
@@ -42,7 +42,8 @@ using std::move, std::make_shared, std::string;
 namespace
 {
 // Do not change, this is tags in edits.xml
-constexpr char const * kXmlRootNode = "mapsme";
+constexpr char const * kXmlOldRootNode = "mapsme";
+constexpr char const * kXmlNewRootNode = "omaps";
 constexpr char const * kXmlMwmNode = "mwm";
 constexpr char const * kDeleteSection = "delete";
 constexpr char const * kModifySection = "modify";
@@ -169,7 +170,11 @@ void Editor::LoadEdits()
   m_features.Set(make_shared<FeaturesContainer>());
   auto loadedFeatures = make_shared<FeaturesContainer>();
 
-  for (auto const & mwm : doc.child(kXmlRootNode).children(kXmlMwmNode))
+  auto rootNode = doc.child(kXmlNewRootNode);
+  // Migrate clients with an old root node.
+  if (!rootNode)
+    rootNode = doc.child(kXmlOldRootNode);
+  for (auto const & mwm : rootNode.children(kXmlMwmNode))
   {
     string const mapName = mwm.attribute("name").as_string("");
     int64_t const mapVersion = mwm.attribute("version").as_llong(0);
@@ -202,7 +207,7 @@ bool Editor::Save(FeaturesContainer const & features) const
     return m_storage->Reset();
 
   xml_document doc;
-  xml_node root = doc.append_child(kXmlRootNode);
+  xml_node root = doc.append_child(kXmlNewRootNode);
   // Use format_version for possible future format changes.
   root.append_attribute("format_version") = 1;
   for (auto const & mwm : features)
-- 
2.45.3


From 62253dd5468a2b0ede74de36de2e7f3893922a14 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Fri, 3 Feb 2023 23:11:55 +0100
Subject: [PATCH 5/7] Review fixes

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 editor/osm_editor.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/editor/osm_editor.cpp b/editor/osm_editor.cpp
index 7b58faf214..16476598bd 100644
--- a/editor/osm_editor.cpp
+++ b/editor/osm_editor.cpp
@@ -41,9 +41,7 @@ using std::move, std::make_shared, std::string;
 
 namespace
 {
-// Do not change, this is tags in edits.xml
-constexpr char const * kXmlOldRootNode = "mapsme";
-constexpr char const * kXmlNewRootNode = "omaps";
+constexpr char const * kXmlRootNode = "omaps";
 constexpr char const * kXmlMwmNode = "mwm";
 constexpr char const * kDeleteSection = "delete";
 constexpr char const * kModifySection = "modify";
@@ -170,10 +168,11 @@ void Editor::LoadEdits()
   m_features.Set(make_shared<FeaturesContainer>());
   auto loadedFeatures = make_shared<FeaturesContainer>();
 
-  auto rootNode = doc.child(kXmlNewRootNode);
+  auto rootNode = doc.child(kXmlRootNode);
   // Migrate clients with an old root node.
   if (!rootNode)
-    rootNode = doc.child(kXmlOldRootNode);
+    rootNode = doc.child("mapsme");
+  CHECK(rootNode, ("The root xml element is invalid"));
   for (auto const & mwm : rootNode.children(kXmlMwmNode))
   {
     string const mapName = mwm.attribute("name").as_string("");
-- 
2.45.3


From a3f95849ae20c29eceb5e31b01697a4754415c32 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Sat, 4 Feb 2023 10:10:14 +0100
Subject: [PATCH 6/7] Follow up fix

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 editor/osm_editor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editor/osm_editor.cpp b/editor/osm_editor.cpp
index 16476598bd..81c5ba24b6 100644
--- a/editor/osm_editor.cpp
+++ b/editor/osm_editor.cpp
@@ -206,7 +206,7 @@ bool Editor::Save(FeaturesContainer const & features) const
     return m_storage->Reset();
 
   xml_document doc;
-  xml_node root = doc.append_child(kXmlNewRootNode);
+  xml_node root = doc.append_child(kXmlRootNode);
   // Use format_version for possible future format changes.
   root.append_attribute("format_version") = 1;
   for (auto const & mwm : features)
-- 
2.45.3


From 5b60b4ade6bc7a0f9156ae054d78678bc4e0b924 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Sat, 4 Feb 2023 14:54:09 +0100
Subject: [PATCH 7/7] Follow up fix

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 editor/osm_editor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editor/osm_editor.cpp b/editor/osm_editor.cpp
index 81c5ba24b6..4a178c957a 100644
--- a/editor/osm_editor.cpp
+++ b/editor/osm_editor.cpp
@@ -172,7 +172,7 @@ void Editor::LoadEdits()
   // Migrate clients with an old root node.
   if (!rootNode)
     rootNode = doc.child("mapsme");
-  CHECK(rootNode, ("The root xml element is invalid"));
+  // TODO: Empty rootNode is an OK case for the current logic and unit tests. Check if there is a better way to do it.
   for (auto const & mwm : rootNode.children(kXmlMwmNode))
   {
     string const mapName = mwm.attribute("name").as_string("");
-- 
2.45.3