AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[generator] Rename functions

Browse source
This commit is contained in:
Sergey Yershov 2016-05-25 12:49:02 +03:00
parent d7d2388c45
commit ae4e149528
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
generator/generator_tests/source_to_element_test.cpp
View file

@ -12,7 +12,7 @@ UNIT_TEST(Source_To_Element_create_from_xml_test)
SourceReader reader(ss);
vector<OsmElement> elements;
BuildFeaturesFromXML(reader, [&elements](OsmElement * e)
ProcessOsmElementsFromXML(reader, [&elements](OsmElement * e)
{
elements.push_back(*e);
});
@ -27,7 +27,7 @@ UNIT_TEST(Source_To_Element_create_from_o5m_test)
SourceReader reader(ss);
vector<OsmElement> elements;
BuildFeaturesFromO5M(reader, [&elements](OsmElement * e)
ProcessOsmElementsFromO5M(reader, [&elements](OsmElement * e)
{
elements.push_back(*e);
});
@ -42,7 +42,7 @@ UNIT_TEST(Source_To_Element_check_equivalence)
SourceReader readerXML(ss1);
vector<OsmElement> elementsXML;
BuildFeaturesFromXML(readerXML, [&elementsXML](OsmElement * e)
ProcessOsmElementsFromXML(readerXML, [&elementsXML](OsmElement * e)
{
elementsXML.push_back(*e);
});
@ -52,7 +52,7 @@ UNIT_TEST(Source_To_Element_check_equivalence)
SourceReader readerO5M(ss2);
vector<OsmElement> elementsO5M;
BuildFeaturesFromO5M(readerO5M, [&elementsO5M](OsmElement * e)
ProcessOsmElementsFromO5M(readerO5M, [&elementsO5M](OsmElement * e)
{
elementsO5M.push_back(*e);
});

8
generator/osm_source.cpp
View file

@ -408,7 +408,7 @@ void BuildIntermediateDataFromXML(SourceReader & stream, TCache & cache, TownsDu
ParseXMLSequence(stream, parser);
}
void BuildFeaturesFromXML(SourceReader & stream, function<void(OsmElement *)> processor)
void ProcessOsmElementsFromXML(SourceReader & stream, function<void(OsmElement *)> processor)
{
XMLSource parser([&](OsmElement * e) { processor(e); });
ParseXMLSequence(stream, parser);
@ -431,7 +431,7 @@ void BuildIntermediateDataFromO5M(SourceReader & stream, TCache & cache, TownsDu
}
}
void BuildFeaturesFromO5M(SourceReader & stream, function<void(OsmElement *)> processor)
void ProcessOsmElementsFromO5M(SourceReader & stream, function<void(OsmElement *)> processor)
{
using TType = osm::O5MSource::EntityType;
@ -532,10 +532,10 @@ bool GenerateFeaturesImpl(feature::GenerateInfo & info)
switch (info.m_osmFileType)
{
case feature::GenerateInfo::OsmSourceType::XML:
BuildFeaturesFromXML(reader, fn);
ProcessOsmElementsFromXML(reader, fn);
break;
case feature::GenerateInfo::OsmSourceType::O5M:
BuildFeaturesFromO5M(reader, fn);
ProcessOsmElementsFromO5M(reader, fn);
break;
}

4
generator/osm_source.hpp
View file

@ -35,6 +35,6 @@ public:
bool GenerateFeatures(feature::GenerateInfo & info);
bool GenerateIntermediateData(feature::GenerateInfo & info);
void BuildFeaturesFromO5M(SourceReader & stream, function<void(OsmElement *)> processor);
void BuildFeaturesFromXML(SourceReader & stream, function<void(OsmElement *)> processor);
void ProcessOsmElementsFromO5M(SourceReader & stream, function<void(OsmElement *)> processor);
void ProcessOsmElementsFromXML(SourceReader & stream, function<void(OsmElement *)> processor);