Rename XMLElement->OsmElement

10 files changed, 96 insertions, 96 deletions

diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index 557157119a..c2ee2c23fa 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -1,6 +1,6 @@
 #include "testing/testing.hpp"
 
-#include "generator/xml_element.hpp"
+#include "generator/osm_element.hpp"
 #include "generator/osm2type.hpp"
 
 #include "routing/car_model.hpp"
@@ -14,7 +14,7 @@
 
 namespace
 {
-  void FillXmlElement(char const * arr[][2], size_t count, XMLElement * p)
+  void FillXmlElement(char const * arr[][2], size_t count, OsmElement * p)
   {
     for (size_t i = 0; i < count; ++i)
       p->AddTag(arr[i][0], arr[i][1]);
@@ -39,7 +39,7 @@ UNIT_TEST(OsmType_SkipDummy)
     { "ref", "E51" }
   };
 
-  XMLElement e;
+  OsmElement e;
   FillXmlElement(arr, ARRAY_SIZE(arr), &e);
 
   FeatureParams params;
@@ -61,7 +61,7 @@ namespace
 
   void DumpParsedTypes(char const * arr[][2], size_t count)
   {
-    XMLElement e;
+    OsmElement e;
     FillXmlElement(arr, count, &e);
 
     FeatureParams params;
@@ -118,7 +118,7 @@ UNIT_TEST(OsmType_Combined)
     { "name", "Гимназия 15" }
   };
 
-  XMLElement e;
+  OsmElement e;
   FillXmlElement(arr, ARRAY_SIZE(arr), &e);
 
   FeatureParams params;
@@ -147,7 +147,7 @@ UNIT_TEST(OsmType_Address)
     { "uir_adr:ADRESA_KOD", "21717036" }
   };
 
-  XMLElement e;
+  OsmElement e;
   FillXmlElement(arr, ARRAY_SIZE(arr), &e);
 
   FeatureParams params;
@@ -173,7 +173,7 @@ UNIT_TEST(OsmType_PlaceState)
     { "ref", "CA" }
   };
 
-  XMLElement e;
+  OsmElement e;
   FillXmlElement(arr, ARRAY_SIZE(arr), &e);
 
   FeatureParams params;
@@ -221,7 +221,7 @@ UNIT_TEST(OsmType_AlabamaRiver)
     { "type", "route" }
   };
 
-  XMLElement e;
+  OsmElement e;
   FillXmlElement(arr1, ARRAY_SIZE(arr1), &e);
   FillXmlElement(arr2, ARRAY_SIZE(arr2), &e);
   FillXmlElement(arr3, ARRAY_SIZE(arr3), &e);
@@ -245,7 +245,7 @@ UNIT_TEST(OsmType_Synonyms)
       { "hotel", "yes" },
     };
 
-    XMLElement e;
+    OsmElement e;
     FillXmlElement(arr, ARRAY_SIZE(arr), &e);
 
     FeatureParams params;
@@ -272,7 +272,7 @@ UNIT_TEST(OsmType_Synonyms)
       { "atm", "yes" }
     };
 
-    XMLElement e;
+    OsmElement e;
     FillXmlElement(arr, ARRAY_SIZE(arr), &e);
 
     FeatureParams params;
@@ -290,7 +290,7 @@ UNIT_TEST(OsmType_Synonyms)
       { "atm", "no" }
     };
 
-    XMLElement e;
+    OsmElement e;
     FillXmlElement(arr, ARRAY_SIZE(arr), &e);
 
     FeatureParams params;
@@ -310,7 +310,7 @@ UNIT_TEST(OsmType_Capital)
       { "place", "city" },
     };
 
-    XMLElement e;
+    OsmElement e;
     FillXmlElement(arr, ARRAY_SIZE(arr), &e);
 
     FeatureParams params;
@@ -327,7 +327,7 @@ UNIT_TEST(OsmType_Capital)
       { "place", "city" },
     };
 
-    XMLElement e;
+    OsmElement e;
     FillXmlElement(arr, ARRAY_SIZE(arr), &e);
 
     FeatureParams params;
@@ -346,7 +346,7 @@ UNIT_TEST(OsmType_Capital)
       { "place", "city" },
     };
 
-    XMLElement e;
+    OsmElement e;
     FillXmlElement(arr, ARRAY_SIZE(arr), &e);
 
     FeatureParams params;
@@ -366,7 +366,7 @@ UNIT_TEST(OsmType_Route)
       { "ref", "I 95" }
     };
 
-    XMLElement e;
+    OsmElement e;
     FillXmlElement(arr, ARRAY_SIZE(arr), &e);
 
     FeatureParams params;
@@ -383,7 +383,7 @@ UNIT_TEST(OsmType_Route)
       { "ref", "route" }
     };
 
-    XMLElement e;
+    OsmElement e;
     FillXmlElement(arr, ARRAY_SIZE(arr), &e);
 
     FeatureParams params;
@@ -404,7 +404,7 @@ UNIT_TEST(OsmType_Layer)
       { "layer", "2" },
     };
 
-    XMLElement e;
+    OsmElement e;
     FillXmlElement(arr, ARRAY_SIZE(arr), &e);
 
     FeatureParams params;
@@ -422,7 +422,7 @@ UNIT_TEST(OsmType_Layer)
       { "layer", "-1" },
     };
 
-    XMLElement e;
+    OsmElement e;
     FillXmlElement(arr, ARRAY_SIZE(arr), &e);
 
     FeatureParams params;
@@ -439,7 +439,7 @@ UNIT_TEST(OsmType_Layer)
       { "bridge", "yes" },
     };
 
-    XMLElement e;
+    OsmElement e;
     FillXmlElement(arr, ARRAY_SIZE(arr), &e);
 
     FeatureParams params;
@@ -456,7 +456,7 @@ UNIT_TEST(OsmType_Layer)
       { "tunnel", "yes" },
     };
 
-    XMLElement e;
+    OsmElement e;
     FillXmlElement(arr, ARRAY_SIZE(arr), &e);
 
     FeatureParams params;
@@ -472,7 +472,7 @@ UNIT_TEST(OsmType_Layer)
       { "highway", "living_street" },
     };
 
-    XMLElement e;
+    OsmElement e;
     FillXmlElement(arr, ARRAY_SIZE(arr), &e);
 
     FeatureParams params;
@@ -492,7 +492,7 @@ UNIT_TEST(OsmType_Amenity)
       { "fuel", "wood" },
     };
 
-    XMLElement e;
+    OsmElement e;
     FillXmlElement(arr, ARRAY_SIZE(arr), &e);
 
     FeatureParams params;
@@ -516,7 +516,7 @@ UNIT_TEST(OsmType_Hwtag)
       { "oneway", "true" },
     };
 
-    XMLElement e;
+    OsmElement e;
     FillXmlElement(arr, ARRAY_SIZE(arr), &e);
 
     FeatureParams params;
@@ -535,7 +535,7 @@ UNIT_TEST(OsmType_Hwtag)
         {"foot", "no"},
     };
 
-    XMLElement e;
+    OsmElement e;
     FillXmlElement(arr, ARRAY_SIZE(arr), &e);
 
     FeatureParams params;
@@ -553,7 +553,7 @@ UNIT_TEST(OsmType_Hwtag)
         {"foot", "yes"}, {"highway", "primary"},
     };
 
-    XMLElement e;
+    OsmElement e;
     FillXmlElement(arr, ARRAY_SIZE(arr), &e);
 
     FeatureParams params;
@@ -576,7 +576,7 @@ UNIT_TEST(OsmType_Ferry)
     { "route", "ferry" },
   };
 
-  XMLElement e;
+  OsmElement e;
   FillXmlElement(arr, ARRAY_SIZE(arr), &e);
 
   FeatureParams params;
@@ -606,7 +606,7 @@ UNIT_TEST(OsmType_Boundary)
     { "boundary", "administrative" },
   };
 
-  XMLElement e;
+  OsmElement e;
   FillXmlElement(arr, ARRAY_SIZE(arr), &e);
 
   FeatureParams params;
@@ -631,7 +631,7 @@ UNIT_TEST(OsmType_Dibrugarh)
     { "website", "http://www.hotelvishal.in" },
   };
 
-  XMLElement e;
+  OsmElement e;
   FillXmlElement(arr, ARRAY_SIZE(arr), &e);
 
   FeatureParams params;
diff --git a/generator/generator_tests/source_to_element_test.cpp b/generator/generator_tests/source_to_element_test.cpp
index c4f2bff576..b92a4332e9 100644
--- a/generator/generator_tests/source_to_element_test.cpp
+++ b/generator/generator_tests/source_to_element_test.cpp
@@ -10,7 +10,7 @@
 
 #include "coding/parse_xml.hpp"
 #include "generator/osm_source.hpp"
-#include "generator/xml_element.hpp"
+#include "generator/osm_element.hpp"
 
 #include "source_data.hpp"
 
@@ -19,8 +19,8 @@ UNIT_TEST(Source_To_Element_create_from_xml_test)
   istringstream ss(way_xml_data);
   SourceReader reader(ss);
 
-  vector<XMLElement> elements;
-  BuildFeaturesFromXML(reader, [&elements](XMLElement * e)
+  vector<OsmElement> elements;
+  BuildFeaturesFromXML(reader, [&elements](OsmElement * e)
   {
     elements.push_back(*e);
   });
@@ -34,8 +34,8 @@ UNIT_TEST(Source_To_Element_create_from_o5m_test)
   istringstream ss(src);
   SourceReader reader(ss);
 
-  vector<XMLElement> elements;
-  BuildFeaturesFromO5M(reader, [&elements](XMLElement * e)
+  vector<OsmElement> elements;
+  BuildFeaturesFromO5M(reader, [&elements](OsmElement * e)
   {
     elements.push_back(*e);
   });
@@ -49,8 +49,8 @@ UNIT_TEST(Source_To_Element_check_equivalence)
   istringstream ss1(relation_xml_data);
   SourceReader readerXML(ss1);
 
-  vector<XMLElement> elementsXML;
-  BuildFeaturesFromXML(readerXML, [&elementsXML](XMLElement * e)
+  vector<OsmElement> elementsXML;
+  BuildFeaturesFromXML(readerXML, [&elementsXML](OsmElement * e)
   {
     elementsXML.push_back(*e);
   });
@@ -59,8 +59,8 @@ UNIT_TEST(Source_To_Element_check_equivalence)
   istringstream ss2(src);
   SourceReader readerO5M(ss2);
 
-  vector<XMLElement> elementsO5M;
-  BuildFeaturesFromO5M(readerO5M, [&elementsO5M](XMLElement * e)
+  vector<OsmElement> elementsO5M;
+  BuildFeaturesFromO5M(readerO5M, [&elementsO5M](OsmElement * e)
   {
     elementsO5M.push_back(*e);
   });
diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp
index 158bb1d366..756bc60315 100644
--- a/generator/osm2type.cpp
+++ b/generator/osm2type.cpp
@@ -63,7 +63,7 @@ namespace ftype
     }
 
     template <typename TResult, class ToDo>
-    TResult for_each_tag(XMLElement * p, ToDo toDo)
+    TResult for_each_tag(OsmElement * p, ToDo toDo)
     {
       TResult res = TResult();
       for (auto & e : p->m_tags)
@@ -83,7 +83,7 @@ namespace ftype
     }
 
     template <typename TResult, class ToDo>
-    TResult for_each_tag_ex(XMLElement * p, ToDo toDo, set<int> & skipTags)
+    TResult for_each_tag_ex(OsmElement * p, ToDo toDo, set<int> & skipTags)
     {
       int id = 0;
       return for_each_tag<TResult>(p, [&](string const & k, string const & v)
@@ -307,10 +307,10 @@ namespace ftype
         return false;
       }
 
-      XMLElement * m_element;
+      OsmElement * m_element;
 
     public:
-      TagProcessor(XMLElement * elem) : m_element(elem) {}
+      TagProcessor(OsmElement * elem) : m_element(elem) {}
 
       template <typename FuncT = void()>
       void ApplyRules(initializer_list<Rule<FuncT>> const & rules) const
@@ -342,14 +342,14 @@ namespace ftype
     };
   }
 
-  size_t ProcessCommonParams(XMLElement * p, FeatureParams & params)
+  size_t ProcessCommonParams(OsmElement * p, FeatureParams & params)
   {
     size_t count;
     for_each_tag<bool>(p, do_find_name(count, params));
     return count;
   }
 
-  void AddLayers(XMLElement * p)
+  void AddLayers(OsmElement * p)
   {
     bool hasLayer = false;
     char const * layer = nullptr;
@@ -423,7 +423,7 @@ namespace ftype
     }
   };
 
-  void GetNameAndType(XMLElement * p, FeatureParams & params)
+  void GetNameAndType(OsmElement * p, FeatureParams & params)
   {
     /// Process synonym tags to match existing classificator types.
     /// @todo We are planning to rewrite classificator <-> tags matching.
diff --git a/generator/osm2type.hpp b/generator/osm2type.hpp
index cf62aa7a40..47c037d30b 100644
--- a/generator/osm2type.hpp
+++ b/generator/osm2type.hpp
@@ -3,12 +3,12 @@
 #include "indexer/feature_data.hpp"
 
 
-struct XMLElement;
+struct OsmElement;
 
 namespace ftype
 {
   /// Get the types, name and layer for feature with the tree of tags.
-  void GetNameAndType(XMLElement * p, FeatureParams & params);
+  void GetNameAndType(OsmElement * p, FeatureParams & params);
 
   /// Check that final types set for feature is valid.
   bool IsValidTypes(FeatureParams const & params);
diff --git a/generator/osm_element.cpp b/generator/osm_element.cpp
index 574fadb29d..28a0b5629d 100644
--- a/generator/osm_element.cpp
+++ b/generator/osm_element.cpp
@@ -6,30 +6,30 @@
 #include "std/algorithm.hpp"
 
 
-string DebugPrint(XMLElement::EntityType e)
+string DebugPrint(OsmElement::EntityType e)
 {
   switch (e)
   {
-    case XMLElement::EntityType::Unknown:
+    case OsmElement::EntityType::Unknown:
       return "unknown";
-    case XMLElement::EntityType::Way:
+    case OsmElement::EntityType::Way:
       return "way";
-    case XMLElement::EntityType::Tag:
+    case OsmElement::EntityType::Tag:
       return "tag";
-    case XMLElement::EntityType::Relation:
+    case OsmElement::EntityType::Relation:
       return "relation";
-    case XMLElement::EntityType::Osm:
+    case OsmElement::EntityType::Osm:
       return "osm";
-    case XMLElement::EntityType::Node:
+    case OsmElement::EntityType::Node:
       return "node";
-    case XMLElement::EntityType::Nd:
+    case OsmElement::EntityType::Nd:
       return "nd";
-    case XMLElement::EntityType::Member:
+    case OsmElement::EntityType::Member:
       return "member";
   }
 }
 
-string XMLElement::ToString(string const & shift) const
+string OsmElement::ToString(string const & shift) const
 {
   stringstream ss;
   ss << (shift.empty() ? "\n" : shift);
@@ -81,7 +81,7 @@ string XMLElement::ToString(string const & shift) const
   return ss.str();
 }
 
-string DebugPrint(XMLElement const & e)
+string DebugPrint(OsmElement const & e)
 {
   return e.ToString();
 }
diff --git a/generator/osm_element.hpp b/generator/osm_element.hpp
index fe79bb318f..3cc7e74062 100644
--- a/generator/osm_element.hpp
+++ b/generator/osm_element.hpp
@@ -11,7 +11,7 @@
 #include "std/string.hpp"
 #include "std/vector.hpp"
 
-struct XMLElement
+struct OsmElement
 {
   enum class EntityType
   {
@@ -105,7 +105,7 @@ struct XMLElement
     return EntityType::Unknown;
   }
 
-  bool operator == (XMLElement const & e) const
+  bool operator == (OsmElement const & e) const
   {
     return (
             type == e.type
@@ -131,4 +131,5 @@ struct XMLElement
   }
 };
 
-string DebugPrint(XMLElement const & e);
+string DebugPrint(OsmElement const & e);
+
diff --git a/generator/osm_source.cpp b/generator/osm_source.cpp
index 4a8304447a..335dd25e6d 100644
--- a/generator/osm_source.cpp
+++ b/generator/osm_source.cpp
@@ -385,13 +385,13 @@ void AddElementToCache(TCache & cache, TElement const & em)
 template <typename TCache>
 void BuildIntermediateDataFromXML(SourceReader & stream, TCache & cache)
 {
-  XMLSource parser([&](XMLElement * e) { AddElementToCache(cache, *e); });
+  XMLSource parser([&](OsmElement * e) { AddElementToCache(cache, *e); });
   ParseXMLSequence(stream, parser);
 }
 
-void BuildFeaturesFromXML(SourceReader & stream, function<void(XMLElement *)> processor)
+void BuildFeaturesFromXML(SourceReader & stream, function<void(OsmElement *)> processor)
 {
-  XMLSource parser([&](XMLElement * e) { processor(e); });
+  XMLSource parser([&](OsmElement * e) { processor(e); });
   ParseXMLSequence(stream, parser);
 }
 
@@ -409,7 +409,7 @@ void BuildIntermediateDataFromO5M(SourceReader & stream, TCache & cache)
     AddElementToCache(cache, e);
 }
 
-void BuildFeaturesFromO5M(SourceReader & stream, function<void(XMLElement *)> processor)
+void BuildFeaturesFromO5M(SourceReader & stream, function<void(OsmElement *)> processor)
 {
   using TType = osm::O5MSource::EntityType;
 
@@ -418,41 +418,41 @@ void BuildFeaturesFromO5M(SourceReader & stream, function<void(XMLElement *)> pr
     return stream.Read(reinterpret_cast<char *>(buffer), size);
   });
 
-  auto translate = [](TType t) -> XMLElement::EntityType
+  auto translate = [](TType t) -> OsmElement::EntityType
   {
     switch (t)
     {
-      case TType::Node: return XMLElement::EntityType::Node;
-      case TType::Way: return XMLElement::EntityType::Way;
-      case TType::Relation: return XMLElement::EntityType::Relation;
-      default: return XMLElement::EntityType::Unknown;
+      case TType::Node: return OsmElement::EntityType::Node;
+      case TType::Way: return OsmElement::EntityType::Way;
+      case TType::Relation: return OsmElement::EntityType::Relation;
+      default: return OsmElement::EntityType::Unknown;
     }
   };
 
   for (auto const & em : dataset)
   {
-    XMLElement p;
+    OsmElement p;
     p.id = em.id;
 
     switch (em.type)
     {
       case TType::Node:
       {
-        p.type = XMLElement::EntityType::Node;
+        p.type = OsmElement::EntityType::Node;
         p.lat = em.lat;
         p.lon = em.lon;
         break;
       }
       case TType::Way:
       {
-        p.type = XMLElement::EntityType::Way;
+        p.type = OsmElement::EntityType::Way;
         for (uint64_t nd : em.Nodes())
           p.AddNd(nd);
         break;
       }
       case TType::Relation:
       {
-        p.type = XMLElement::EntityType::Relation;
+        p.type = OsmElement::EntityType::Relation;
         for (auto const & member : em.Members())
           p.AddMember(member.ref, translate(member.type), member.role);
         break;
@@ -487,7 +487,7 @@ bool GenerateFeaturesImpl(feature::GenerateInfo & info)
         bucketer, cache, info.m_makeCoasts ? classif().GetCoastType() : 0,
         info.GetAddressesFileName());
 
-    auto fn = [&parser](XMLElement * e) { parser.EmitElement(e); };
+    auto fn = [&parser](OsmElement * e) { parser.EmitElement(e); };
 
     SourceReader reader = info.m_osmFileName.empty() ? SourceReader() : SourceReader(info.m_osmFileName);
     switch (info.m_osmFileType)
diff --git a/generator/osm_source.hpp b/generator/osm_source.hpp
index 5fd7494de5..135d8e2829 100644
--- a/generator/osm_source.hpp
+++ b/generator/osm_source.hpp
@@ -35,6 +35,6 @@ public:
 bool GenerateFeatures(feature::GenerateInfo & info);
 bool GenerateIntermediateData(feature::GenerateInfo & info);
 
-void BuildFeaturesFromO5M(SourceReader & stream, function<void(XMLElement *)> processor);
-void BuildFeaturesFromXML(SourceReader & stream, function<void(XMLElement *)> processor);
+void BuildFeaturesFromO5M(SourceReader & stream, function<void(OsmElement *)> processor);
+void BuildFeaturesFromXML(SourceReader & stream, function<void(OsmElement *)> processor);
 
diff --git a/generator/osm_translator.hpp b/generator/osm_translator.hpp
index fd003289ff..7bc1835030 100644
--- a/generator/osm_translator.hpp
+++ b/generator/osm_translator.hpp
@@ -145,7 +145,7 @@ class OsmToFeatureTranslator
 
   protected:
     uint64_t m_featureID;
-    XMLElement * m_current;
+    OsmElement * m_current;
 
   private:
     my::Cache<uint64_t, RelationElement> m_cache;
@@ -202,7 +202,7 @@ class OsmToFeatureTranslator
       if (TBase::IsSkipRelation(type) || type == "route")
         return;
 
-      bool const isWay = (TBase::m_current->type == XMLElement::EntityType::Way);
+      bool const isWay = (TBase::m_current->type == OsmElement::EntityType::Way);
       bool const isBoundary = isWay && (type == "boundary") && IsAcceptBoundary(e);
 
       NameKeysT nameKeys;
@@ -227,17 +227,16 @@ class OsmToFeatureTranslator
         TBase::m_current->AddTag(p.first, p.second);
       }
     }
-  } m_wayRelations;
 
-  bool ParseType(XMLElement * p, FeatureParams & params)
+  bool ParseType(OsmElement * p, FeatureParams & params)
   {
     // Get tags from parent relations.
-    if (p->type == XMLElement::EntityType::Node)
+    if (p->type == OsmElement::EntityType::Node)
     {
       m_nodeRelations.Reset(p->id, p);
       m_holder.ForEachRelationByNodeCached(p->id, m_nodeRelations);
     }
-    else if (p->type == XMLElement::EntityType::Way)
+    else if (p->type == OsmElement::EntityType::Way)
     {
       m_wayRelations.Reset(p->id, p);
       m_holder.ForEachRelationByWayCached(p->id, m_wayRelations);
@@ -431,9 +430,9 @@ class OsmToFeatureTranslator
 
 public:
   /// The main entry point for parsing process.
-  void EmitElement(XMLElement * p)
+  void EmitElement(OsmElement * p)
   {
-    if (p->type == XMLElement::EntityType::Node)
+    if (p->type == OsmElement::EntityType::Node)
     {
       if (p->m_tags.empty())
         return;
@@ -445,7 +444,7 @@ public:
       m2::PointD const pt = MercatorBounds::FromLatLon(p->lat, p->lon);
       EmitPoint(pt, params, osm::Id::Node(p->id));
     }
-    else if (p->type == XMLElement::EntityType::Way)
+    else if (p->type == OsmElement::EntityType::Way)
     {
       FeatureBuilderT ft;
 
@@ -479,7 +478,7 @@ public:
 
       EmitLine(ft, params, isCoastLine);
     }
-    else if (p->type == XMLElement::EntityType::Relation)
+    else if (p->type == OsmElement::EntityType::Relation)
     {
       {
         // 1. Check, if this is our processable relation. Here we process only polygon relations.
@@ -504,7 +503,7 @@ public:
       // 3. Iterate ways to get 'outer' and 'inner' geometries
       for (auto const & e : p->Members())
       {
-        if (e.type != XMLElement::EntityType::Way)
+        if (e.type != OsmElement::EntityType::Way)
           continue;
 
         if (e.role == "outer")
diff --git a/generator/osm_xml_source.hpp b/generator/osm_xml_source.hpp
index 04a4995b4c..2c0e87a7db 100644
--- a/generator/osm_xml_source.hpp
+++ b/generator/osm_xml_source.hpp
@@ -12,13 +12,13 @@
 
 class XMLSource
 {
-  XMLElement m_parent;
-  XMLElement m_child;
+  OsmElement m_parent;
+  OsmElement m_child;
 
   size_t m_depth = 0;
-  XMLElement * m_current = nullptr;
+  OsmElement * m_current = nullptr;
 
-  using TEmmiterFn = function<void(XMLElement *)>;
+  using TEmmiterFn = function<void(OsmElement *)>;
   TEmmiterFn m_EmmiterFn;
 
 public:
@@ -44,7 +44,7 @@ public:
     else if (key == "v")
       m_current->v = value;
     else if (key == "type")
-      m_current->memberType = XMLElement::StringToEntityType(value);
+      m_current->memberType = OsmElement::StringToEntityType(value);
     else if (key == "role")
       m_current->role = value;
   }
@@ -54,7 +54,7 @@ public:
     ASSERT_GREATER_OR_EQUAL(tagName.size(), 2, ());
 
     // As tagKey we use first two char of tag name.
-    XMLElement::EntityType tagKey = XMLElement::EntityType(*reinterpret_cast<uint16_t const *>(tagName.data()));
+    OsmElement::EntityType tagKey = OsmElement::EntityType(*reinterpret_cast<uint16_t const *>(tagName.data()));
 
     switch (++m_depth)
     {
@@ -87,13 +87,13 @@ public:
       default:
         switch (m_child.type)
       {
-        case XMLElement::EntityType::Member:
+        case OsmElement::EntityType::Member:
           m_parent.AddMember(m_child.ref, m_child.memberType, m_child.role);
           break;
-        case XMLElement::EntityType::Tag:
+        case OsmElement::EntityType::Tag:
           m_parent.AddTag(m_child.k, m_child.v);
           break;
-        case XMLElement::EntityType::Nd:
+        case OsmElement::EntityType::Nd:
           m_parent.AddNd(m_child.ref);
         default: break;
       }