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

[routing] Review fixes.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2018-10-19 15:07:01 +03:00 • committed by mpimenov
parent 1b00488c3c
commit 4ccf58bdb2
4 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
generator/generator_tool/generator_tool.cpp
View file

@ -137,6 +137,7 @@ DEFINE_bool(generate_cameras, false, "Generate section with speed cameras info."
DEFINE_bool(
make_city_roads, false,
"Calculates which roads lie inside cities and makes a section with ids of these roads.");
DEFINE_bool(generate_maxspeed, false, "Generate section with maxspeed of road features.");
// Sponsored-related.
DEFINE_string(booking_data, "", "Path to booking data in .tsv format.");

31
generator/maxspeed_builder.cpp
View file

@ -13,7 +13,7 @@ namespace feature
using namespace base;
using namespace std;
void MaxspeedBuilder::operator()(OsmElement const & p)
void MaxspeedBuilder::Process(OsmElement const & p)
{
ostringstream ss;
ss << p.id << ",";
@ -24,17 +24,16 @@ void MaxspeedBuilder::operator()(OsmElement const & p)
for (auto const & t : tags)
{
if (t.key == string("maxspeed"))
if (t.key == "maxspeed")
{
ss << t.value;
m_data.push_back(ss.str());
return;
}
if (t.key == string("maxspeed:forward"))
if (t.key == "maxspeed:forward")
maxspeedForward = t.value;
if (t.key == string("maxspeed:backward"))
else if (t.key == "maxspeed:backward")
maxspeedBackward = t.value;
}
@ -50,22 +49,18 @@ void MaxspeedBuilder::operator()(OsmElement const & p)
void MaxspeedBuilder::Flush()
{
try
{
LOG(LINFO, ("Saving maxspeed tag values to", m_filePath));
ofstream stream(m_filePath);
LOG(LINFO, ("Saving maxspeed tag values to", m_filePath));
ofstream stream(m_filePath);
if (!stream.is_open())
LOG(LERROR, ("Cannot open file", m_filePath));
if (!stream.is_open())
LOG(LERROR, ("Cannot open file", m_filePath));
for (auto const & s : m_data)
stream << s << '\n';
for (auto const & s : m_data)
stream << s << '\n';
if (stream.fail())
LOG(LERROR, ("Cannot write to file", m_filePath));
else
LOG(LINFO, ("Wrote", m_data.size(), "maxspeed tags to", m_filePath));
}
catch (RootException const & e)
{
LOG(LERROR, ("An exception happened while saving tags to", m_filePath, ":", e.what()));
}
}
} // namespace feature

2
generator/maxspeed_builder.hpp
View file

@ -16,7 +16,7 @@ public:
explicit MaxspeedBuilder(std::string const & filePath) : m_filePath(filePath) {}
~MaxspeedBuilder() { Flush(); }
void operator()(OsmElement const & el);
void Process(OsmElement const & el);
private:
void Flush();

2
generator/translator_planet.cpp
View file

@ -97,7 +97,7 @@ void TranslatorPlanet::EmitElement(OsmElement * p)
ft.SetOsmId(base::MakeOsmWay(p->id));
m_maxspeedBuilder(*p);
m_maxspeedBuilder.Process(*p);
bool isCoastline = (m_coastType != 0 && params.IsTypeExist(m_coastType));