forked from organicmaps/organicmaps
Remove stupid comments. Truncate all coordinates to five numbers after decimal point.
Get rid of default values. Small Fixes. Rename variables. Rename type. Fix according to notes.
This commit is contained in:
Sergey Magidovich
parent
2f884e795c
commit
e510c65642
11 changed files with 109 additions and 110 deletions
|
|
@ -132,7 +132,7 @@ private:
|
|||
class Uint32ValueList
|
||||
{
|
||||
public:
|
||||
using BufferT = vector<uint32_t>;
|
||||
using TBuffer = vector<uint32_t>;
|
||||
|
||||
void Append(uint32_t value)
|
||||
{
|
||||
|
|
@ -146,11 +146,11 @@ public:
|
|||
template <typename TSink>
|
||||
void Dump(TSink & sink) const
|
||||
{
|
||||
sink.Write(m_values.data(), m_values.size() * sizeof(BufferT::value_type));
|
||||
sink.Write(m_values.data(), m_values.size() * sizeof(TBuffer::value_type));
|
||||
}
|
||||
|
||||
private:
|
||||
BufferT m_values;
|
||||
TBuffer m_values;
|
||||
};
|
||||
|
||||
} // unnamed namespace
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ using namespace feature;
|
|||
// FeatureBase implementation
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
void FeatureBase::Deserialize(feature::LoaderBase * pLoader, BufferT buffer)
|
||||
void FeatureBase::Deserialize(feature::LoaderBase * pLoader, TBuffer buffer)
|
||||
{
|
||||
m_pLoader = pLoader;
|
||||
m_pLoader->Init(buffer);
|
||||
|
|
@ -76,7 +76,7 @@ string FeatureBase::DebugString() const
|
|||
// FeatureType implementation
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
void FeatureType::Deserialize(feature::LoaderBase * pLoader, BufferT buffer)
|
||||
void FeatureType::Deserialize(feature::LoaderBase * pLoader, TBuffer buffer)
|
||||
{
|
||||
base_type::Deserialize(pLoader, buffer);
|
||||
|
||||
|
|
|
|||
|
|
@ -29,9 +29,9 @@ class FeatureBase
|
|||
|
||||
public:
|
||||
|
||||
using BufferT = char const *;
|
||||
using TBuffer = char const *;
|
||||
|
||||
void Deserialize(feature::LoaderBase * pLoader, BufferT buffer);
|
||||
void Deserialize(feature::LoaderBase * pLoader, TBuffer buffer);
|
||||
|
||||
/// @name Parse functions. Do simple dispatching to m_pLoader.
|
||||
//@{
|
||||
|
|
@ -151,7 +151,7 @@ class FeatureType : public FeatureBase
|
|||
FeatureID m_id;
|
||||
|
||||
public:
|
||||
void Deserialize(feature::LoaderBase * pLoader, BufferT buffer);
|
||||
void Deserialize(feature::LoaderBase * pLoader, TBuffer buffer);
|
||||
|
||||
inline void SetID(FeatureID const & id) { m_id = id; }
|
||||
inline FeatureID GetID() const { return m_id; }
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ LoaderBase::LoaderBase(SharedLoadInfo const & info)
|
|||
{
|
||||
}
|
||||
|
||||
void LoaderBase::Init(BufferT data)
|
||||
void LoaderBase::Init(TBuffer data)
|
||||
{
|
||||
m_Data = data;
|
||||
m_pF = 0;
|
||||
|
|
|
|||
|
|
@ -58,11 +58,11 @@ namespace feature
|
|||
virtual ~LoaderBase() {}
|
||||
|
||||
// It seems like no need to store a copy of buffer (see FeaturesVector).
|
||||
typedef char const * BufferT;
|
||||
typedef char const * TBuffer;
|
||||
|
||||
/// @name Initialize functions.
|
||||
//@{
|
||||
void Init(BufferT data);
|
||||
void Init(TBuffer data);
|
||||
inline void InitFeature(FeatureType * p) { m_pF = p; }
|
||||
|
||||
void ResetGeometry();
|
||||
|
|
@ -99,7 +99,7 @@ namespace feature
|
|||
SharedLoadInfo const & m_Info;
|
||||
FeatureType * m_pF;
|
||||
|
||||
BufferT m_Data;
|
||||
TBuffer m_Data;
|
||||
|
||||
static uint32_t const m_TypesOffset = 1;
|
||||
uint32_t m_CommonOffset, m_Header2Offset;
|
||||
|
|
|
|||
|
|
@ -135,20 +135,20 @@ namespace serial
|
|||
};
|
||||
}
|
||||
|
||||
void TrianglesChainSaver::operator() (PointT arr[3], vector<EdgeT> edges)
|
||||
void TrianglesChainSaver::operator() (TPoint arr[3], vector<TEdge> edges)
|
||||
{
|
||||
m_buffers.push_back(BufferT());
|
||||
MemWriter<BufferT> writer(m_buffers.back());
|
||||
m_buffers.push_back(TBuffer());
|
||||
MemWriter<TBuffer> writer(m_buffers.back());
|
||||
|
||||
WriteVarUint(writer, EncodeDelta(arr[0], m_base));
|
||||
WriteVarUint(writer, EncodeDelta(arr[1], arr[0]));
|
||||
|
||||
EdgeT curr = edges.front();
|
||||
TEdge curr = edges.front();
|
||||
curr.m_delta = EncodeDelta(arr[2], arr[1]);
|
||||
|
||||
sort(edges.begin(), edges.end(), edge_less_p0());
|
||||
|
||||
stack<EdgeT> st;
|
||||
stack<TEdge> st;
|
||||
while (true)
|
||||
{
|
||||
CHECK_EQUAL ( curr.m_delta >> 62, 0, () );
|
||||
|
|
@ -156,7 +156,7 @@ namespace serial
|
|||
|
||||
// find next edges
|
||||
int const nextNode = curr.m_p[1];
|
||||
vector<EdgeT>::iterator i = lower_bound(edges.begin(), edges.end(), nextNode, edge_less_p0());
|
||||
auto i = lower_bound(edges.begin(), edges.end(), nextNode, edge_less_p0());
|
||||
bool const found = (i != edges.end() && i->m_p[0] == nextNode);
|
||||
if (found)
|
||||
{
|
||||
|
|
@ -168,7 +168,7 @@ namespace serial
|
|||
// first child
|
||||
delta |= (one << i->m_side);
|
||||
|
||||
vector<EdgeT>::iterator j = i+1;
|
||||
vector<TEdge>::iterator j = i+1;
|
||||
if (j != edges.end() && j->m_p[0] == nextNode)
|
||||
{
|
||||
// second child
|
||||
|
|
|
|||
|
|
@ -159,27 +159,28 @@ namespace serial
|
|||
|
||||
class TrianglesChainSaver
|
||||
{
|
||||
typedef m2::PointU PointT;
|
||||
typedef tesselator::Edge EdgeT;
|
||||
typedef vector<char> BufferT;
|
||||
using TPoint = m2::PointU;
|
||||
using TEdge = tesselator::Edge;
|
||||
using TBuffer = vector<char>;
|
||||
|
||||
PointT m_base, m_max;
|
||||
TPoint m_base;
|
||||
TPoint m_max;
|
||||
|
||||
list<BufferT> m_buffers;
|
||||
list<TBuffer> m_buffers;
|
||||
|
||||
public:
|
||||
explicit TrianglesChainSaver(CodingParams const & params);
|
||||
|
||||
PointT GetBasePoint() const { return m_base; }
|
||||
PointT GetMaxPoint() const { return m_max; }
|
||||
TPoint GetBasePoint() const { return m_base; }
|
||||
TPoint GetMaxPoint() const { return m_max; }
|
||||
|
||||
void operator() (PointT arr[3], vector<EdgeT> edges);
|
||||
void operator() (TPoint arr[3], vector<TEdge> edges);
|
||||
|
||||
size_t GetBufferSize() const
|
||||
{
|
||||
size_t sz = 0;
|
||||
for (list<BufferT>::const_iterator i = m_buffers.begin(); i != m_buffers.end(); ++i)
|
||||
sz += i->size();
|
||||
for (auto const & i : m_buffers)
|
||||
sz += i.size();
|
||||
return sz;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
using namespace routing;
|
||||
using namespace routing::turns;
|
||||
|
||||
UNIT_TEST(RussiaMoscowLenigradskiy39UturnTurnTest) // FAILED!
|
||||
UNIT_TEST(RussiaMoscowLenigradskiy39UturnTurnTest)
|
||||
{
|
||||
TRouteResult const routeResult = integration::CalculateRoute(
|
||||
integration::GetOsrmComponents(),
|
||||
MercatorBounds::FromLatLon(55.796936768447288557, 37.537544383032567907), {0., 0.},
|
||||
MercatorBounds::FromLatLon(55.802121583039429709, 37.538908531885972764));
|
||||
MercatorBounds::FromLatLon(55.79693, 37.53754), {0., 0.},
|
||||
MercatorBounds::FromLatLon(55.80212, 37.5389));
|
||||
|
||||
Route const & route = *routeResult.first;
|
||||
IRouter::ResultCode const result = routeResult.second;
|
||||
|
|
@ -36,8 +36,8 @@ UNIT_TEST(RussiaMoscowSalameiNerisUturnTurnTest)
|
|||
{
|
||||
TRouteResult const routeResult = integration::CalculateRoute(
|
||||
integration::GetOsrmComponents(),
|
||||
MercatorBounds::FromLatLon(55.851822802555439296, 37.39533227665661741), {0., 0.},
|
||||
MercatorBounds::FromLatLon(55.843866280669693936, 37.392503720352721075));
|
||||
MercatorBounds::FromLatLon(55.85182, 37.39533), {0., 0.},
|
||||
MercatorBounds::FromLatLon(55.84386, 37.39250));
|
||||
Route const & route = *routeResult.first;
|
||||
IRouter::ResultCode const result = routeResult.second;
|
||||
|
||||
|
|
@ -45,30 +45,30 @@ UNIT_TEST(RussiaMoscowSalameiNerisUturnTurnTest)
|
|||
integration::TestTurnCount(route, 4);
|
||||
integration::GetNthTurn(route, 0)
|
||||
.TestValid()
|
||||
.TestPoint({37.388482521388539, 67.633382734905041}, 20.)
|
||||
.TestPoint({37.38848, 67.63338}, 20.)
|
||||
.TestDirection(TurnDirection::TurnSlightRight);
|
||||
integration::GetNthTurn(route, 1)
|
||||
.TestValid()
|
||||
.TestPoint({37.387117276989784, 67.633369323859881}, 20.)
|
||||
.TestPoint({37.38711, 67.63336}, 20.)
|
||||
.TestDirection(TurnDirection::TurnLeft);
|
||||
integration::GetNthTurn(route, 2)
|
||||
.TestValid()
|
||||
.TestPoint({37.387380133475205, 67.632781920081243}, 20.)
|
||||
.TestPoint({37.38738, 67.63278}, 20.)
|
||||
.TestDirection(TurnDirection::TurnLeft);
|
||||
integration::GetNthTurn(route, 3)
|
||||
.TestValid()
|
||||
.TestPoint({37.390526364673121, 67.633106467374461}, 20.)
|
||||
.TestPoint({37.39052, 67.63310}, 20.)
|
||||
.TestDirection(TurnDirection::TurnRight);
|
||||
|
||||
integration::TestRouteLength(route, 1637.);
|
||||
}
|
||||
|
||||
UNIT_TEST(RussiaMoscowTrikotagniAndPohodniRoundaboutTurnTest) //Failed
|
||||
UNIT_TEST(RussiaMoscowTrikotagniAndPohodniRoundaboutTurnTest)
|
||||
{
|
||||
TRouteResult const routeResult = integration::CalculateRoute(
|
||||
integration::GetOsrmComponents(),
|
||||
MercatorBounds::FromLatLon(55.831185109716038539, 37.405153751040685961), {0., 0.},
|
||||
MercatorBounds::FromLatLon(55.833843764465711956, 37.405210716570380214));
|
||||
MercatorBounds::FromLatLon(55.83118, 37.40515), {0., 0.},
|
||||
MercatorBounds::FromLatLon(55.83384, 37.40521));
|
||||
Route const & route = *routeResult.first;
|
||||
IRouter::ResultCode const result = routeResult.second;
|
||||
|
||||
|
|
@ -88,8 +88,8 @@ UNIT_TEST(RussiaMoscowPlanetnaiTurnTest)
|
|||
{
|
||||
TRouteResult const routeResult = integration::CalculateRoute(
|
||||
integration::GetOsrmComponents(),
|
||||
MercatorBounds::FromLatLon(55.802161062035722239, 37.546683164991776493), {0., 0.},
|
||||
MercatorBounds::FromLatLon(55.801690565608659256, 37.549153861529006804));
|
||||
MercatorBounds::FromLatLon(55.80216, 37.54668), {0., 0.},
|
||||
MercatorBounds::FromLatLon(55.80169, 37.54915));
|
||||
|
||||
Route const & route = *routeResult.first;
|
||||
IRouter::ResultCode const result = routeResult.second;
|
||||
|
|
@ -105,8 +105,8 @@ UNIT_TEST(RussiaMoscowNoTurnsOnMKADTurnTest)
|
|||
{
|
||||
TRouteResult const routeResult = integration::CalculateRoute(
|
||||
integration::GetOsrmComponents(),
|
||||
MercatorBounds::FromLatLon(55.846564134248033895, 37.391635636579785285), {0., 0.},
|
||||
MercatorBounds::FromLatLon(55.566611639650901111, 37.692547253527685314));
|
||||
MercatorBounds::FromLatLon(55.84656, 37.39163), {0., 0.},
|
||||
MercatorBounds::FromLatLon(55.56661, 37.69254));
|
||||
|
||||
Route const & route = *routeResult.first;
|
||||
IRouter::ResultCode const result = routeResult.second;
|
||||
|
|
@ -115,18 +115,18 @@ UNIT_TEST(RussiaMoscowNoTurnsOnMKADTurnTest)
|
|||
integration::TestTurnCount(route, 1);
|
||||
integration::GetNthTurn(route, 0)
|
||||
.TestValid()
|
||||
.TestPoint({37.682761085650043, 67.140620702062705})
|
||||
.TestPoint({37.68276, 67.14062})
|
||||
.TestOneOfDirections({TurnDirection::TurnSlightRight, TurnDirection::TurnRight});
|
||||
|
||||
integration::TestRouteLength(route, 43233.7);
|
||||
}
|
||||
|
||||
UNIT_TEST(RussiaMoscowTTKKashirskoeShosseOutTurnTest) // Failed
|
||||
UNIT_TEST(RussiaMoscowTTKKashirskoeShosseOutTurnTest)
|
||||
{
|
||||
TRouteResult const routeResult = integration::CalculateRoute(
|
||||
integration::GetOsrmComponents(),
|
||||
MercatorBounds::FromLatLon(55.70160163595921432, 37.606320023648997619), {0., 0.},
|
||||
MercatorBounds::FromLatLon(55.693494620969019593, 37.621220025471167503));
|
||||
MercatorBounds::FromLatLon(55.70160, 37.60632), {0., 0.},
|
||||
MercatorBounds::FromLatLon(55.69349, 37.62122));
|
||||
|
||||
Route const & route = *routeResult.first;
|
||||
IRouter::ResultCode const result = routeResult.second;
|
||||
|
|
@ -142,8 +142,8 @@ UNIT_TEST(RussiaMoscowPankratevskiPerBolshaySuharedskazPloschadTurnTest)
|
|||
{
|
||||
TRouteResult const routeResult = integration::CalculateRoute(
|
||||
integration::GetOsrmComponents(),
|
||||
MercatorBounds::FromLatLon(55.771770051239521138, 37.635563528539393019), {0., 0.},
|
||||
MercatorBounds::FromLatLon(55.772033898671161012, 37.637054339197831609));
|
||||
MercatorBounds::FromLatLon(55.77177, 37.63556), {0., 0.},
|
||||
MercatorBounds::FromLatLon(55.77203, 37.63705));
|
||||
|
||||
Route const & route = *routeResult.first;
|
||||
IRouter::ResultCode const result = routeResult.second;
|
||||
|
|
@ -157,8 +157,8 @@ UNIT_TEST(RussiaMoscowMKADPutilkovskeShosseTurnTest)
|
|||
{
|
||||
TRouteResult const routeResult = integration::CalculateRoute(
|
||||
integration::GetOsrmComponents(),
|
||||
MercatorBounds::FromLatLon(55.853059336007213176, 37.394141645624102921), {0., 0.},
|
||||
MercatorBounds::FromLatLon(55.850996974780500182, 37.391050708989460816));
|
||||
MercatorBounds::FromLatLon(55.85305, 37.39414), {0., 0.},
|
||||
MercatorBounds::FromLatLon(55.85099, 37.39105));
|
||||
|
||||
Route const & route = *routeResult.first;
|
||||
IRouter::ResultCode const result = routeResult.second;
|
||||
|
|
@ -173,8 +173,8 @@ UNIT_TEST(RussiaMoscowPetushkovaShodniaReverTurnTest)
|
|||
{
|
||||
TRouteResult const routeResult = integration::CalculateRoute(
|
||||
integration::GetOsrmComponents(),
|
||||
MercatorBounds::FromLatLon(55.841047134659639539, 37.405917692164507571), {0., 0.},
|
||||
MercatorBounds::FromLatLon(55.839290964451890886, 37.408550782937481927));
|
||||
MercatorBounds::FromLatLon(55.84104, 37.40591), {0., 0.},
|
||||
MercatorBounds::FromLatLon(55.83929, 37.40855));
|
||||
|
||||
Route const & route = *routeResult.first;
|
||||
IRouter::ResultCode const result = routeResult.second;
|
||||
|
|
@ -187,8 +187,8 @@ UNIT_TEST(RussiaHugeRoundaboutTurnTest)
|
|||
{
|
||||
TRouteResult const routeResult = integration::CalculateRoute(
|
||||
integration::GetOsrmComponents(),
|
||||
MercatorBounds::FromLatLon(55.801410375094782523, 37.325810690728495445), {0., 0.},
|
||||
MercatorBounds::FromLatLon(55.800757342904596214, 37.325360456262153264));
|
||||
MercatorBounds::FromLatLon(55.80141, 37.32581), {0., 0.},
|
||||
MercatorBounds::FromLatLon(55.80075, 37.32536));
|
||||
|
||||
Route const & route = *routeResult.first;
|
||||
IRouter::ResultCode const result = routeResult.second;
|
||||
|
|
@ -209,8 +209,8 @@ UNIT_TEST(BelarusMiskProspNezavisimostiMKADTurnTest)
|
|||
{
|
||||
TRouteResult const routeResult = integration::CalculateRoute(
|
||||
integration::GetOsrmComponents(),
|
||||
MercatorBounds::FromLatLon(53.936425941857663702, 27.658572046123946819), {0., 0.},
|
||||
MercatorBounds::FromLatLon(53.939337747485986085, 27.670461944729382253));
|
||||
MercatorBounds::FromLatLon(53.93642, 27.65857), {0., 0.},
|
||||
MercatorBounds::FromLatLon(53.93933, 27.67046));
|
||||
|
||||
Route const & route = *routeResult.first;
|
||||
IRouter::ResultCode const result = routeResult.second;
|
||||
|
|
@ -227,8 +227,8 @@ UNIT_TEST(RussiaMoscowPetushkovaPetushkovaTest)
|
|||
{
|
||||
TRouteResult const routeResult = integration::CalculateRoute(
|
||||
integration::GetOsrmComponents(),
|
||||
MercatorBounds::FromLatLon(55.836368736509733424, 37.405549999999998079), {0., 0.},
|
||||
MercatorBounds::FromLatLon(55.837076293494696699, 37.404890000000001749));
|
||||
MercatorBounds::FromLatLon(55.83636, 37.40555), {0., 0.},
|
||||
MercatorBounds::FromLatLon(55.83707, 37.40489));
|
||||
|
||||
Route const & route = *routeResult.first;
|
||||
IRouter::ResultCode const result = routeResult.second;
|
||||
|
|
@ -257,8 +257,8 @@ UNIT_TEST(BelarusMKADShosseinai)
|
|||
{
|
||||
TRouteResult const routeResult = integration::CalculateRoute(
|
||||
integration::GetOsrmComponents(),
|
||||
MercatorBounds::FromLatLon(55.315418609956843454, 29.431229999999999336), {0., 0.},
|
||||
MercatorBounds::FromLatLon(55.316562400560414403, 29.426259999999999195));
|
||||
MercatorBounds::FromLatLon(55.31541, 29.43123), {0., 0.},
|
||||
MercatorBounds::FromLatLon(55.31656, 29.42626));
|
||||
|
||||
Route const & route = *routeResult.first;
|
||||
IRouter::ResultCode const result = routeResult.second;
|
||||
|
|
@ -275,8 +275,8 @@ UNIT_TEST(ThailandPhuketNearPrabarameeRoad)
|
|||
{
|
||||
TRouteResult const routeResult = integration::CalculateRoute(
|
||||
integration::GetOsrmComponents(),
|
||||
MercatorBounds::FromLatLon(7.9179763567919980716, 98.369370000000003529), {0., 0.},
|
||||
MercatorBounds::FromLatLon(7.9072494672603861332, 98.367850000000004229));
|
||||
MercatorBounds::FromLatLon(7.91797, 98.36937), {0., 0.},
|
||||
MercatorBounds::FromLatLon(7.90724, 98.36785));
|
||||
|
||||
Route const & route = *routeResult.first;
|
||||
IRouter::ResultCode const result = routeResult.second;
|
||||
|
|
|
|||
|
|
@ -699,27 +699,27 @@ OsrmRouter::ResultCode OsrmRouter::MakeTurnAnnotation(
|
|||
size_t lastIdx = 0;
|
||||
#endif
|
||||
|
||||
for (auto const & segment : routingResult.unpackedPathSegments)
|
||||
for (auto const & pathSegments : routingResult.unpackedPathSegments)
|
||||
{
|
||||
INTERRUPT_WHEN_CANCELLED(delegate);
|
||||
|
||||
// Get all the coordinates for the computed route
|
||||
size_t const n = segment.size();
|
||||
for (size_t j = 0; j < n; ++j) // todo(mgsergio) rename!
|
||||
// Get all computed route coordinates.
|
||||
size_t const numSegments = pathSegments.size();
|
||||
for (size_t segmentIndex = 0; segmentIndex < numSegments; ++segmentIndex)
|
||||
{
|
||||
RawPathData const & path_data = segment[j];
|
||||
RawPathData const & pathData = pathSegments[segmentIndex];
|
||||
|
||||
if (j > 0 && !points.empty())
|
||||
if (segmentIndex > 0 && !points.empty())
|
||||
{
|
||||
turns::TurnItem turnItem;
|
||||
turnItem.m_index = static_cast<uint32_t>(points.size() - 1);
|
||||
|
||||
turns::TurnInfo turnInfo(*mapping, segment[j - 1].node, segment[j].node);
|
||||
turns::TurnInfo turnInfo(*mapping, pathSegments[segmentIndex - 1].node, pathSegments[segmentIndex].node);
|
||||
turns::GetTurnDirection(*m_pIndex, turnInfo, turnItem);
|
||||
|
||||
// ETA information.
|
||||
// Osrm multiples seconds to 10, so we need to divide it back.
|
||||
double const nodeTimeSeconds = path_data.segmentWeight / 10.0;
|
||||
double const nodeTimeSeconds = pathData.segmentWeight / 10.0;
|
||||
|
||||
#ifdef DEBUG
|
||||
double distMeters = 0.0;
|
||||
|
|
@ -736,14 +736,14 @@ OsrmRouter::ResultCode OsrmRouter::MakeTurnAnnotation(
|
|||
// Lane information.
|
||||
if (turnItem.m_turn != turns::TurnDirection::NoTurn)
|
||||
{
|
||||
turnItem.m_lanes = turns::GetLanesInfo(segment[j - 1].node,
|
||||
turnItem.m_lanes = turns::GetLanesInfo(pathSegments[segmentIndex - 1].node,
|
||||
*mapping, turns::GetLastSegmentPointIndex, *m_pIndex);
|
||||
turnsDir.push_back(move(turnItem));
|
||||
}
|
||||
}
|
||||
|
||||
buffer_vector<TSeg, 8> buffer;
|
||||
mapping->m_segMapping.ForEachFtSeg(path_data.node, MakeBackInsertFunctor(buffer));
|
||||
mapping->m_segMapping.ForEachFtSeg(pathData.node, MakeBackInsertFunctor(buffer));
|
||||
|
||||
auto FindIntersectingSeg = [&buffer] (TSeg const & seg) -> size_t
|
||||
{
|
||||
|
|
@ -761,13 +761,13 @@ OsrmRouter::ResultCode OsrmRouter::MakeTurnAnnotation(
|
|||
|
||||
//Do not put out node geometry (we do not have it)!
|
||||
size_t startK = 0, endK = buffer.size();
|
||||
if (j == 0)
|
||||
if (segmentIndex == 0)
|
||||
{
|
||||
if (!segBegin.IsValid())
|
||||
continue;
|
||||
startK = FindIntersectingSeg(segBegin);
|
||||
}
|
||||
if (j == n - 1)
|
||||
if (segmentIndex + 1 == numSegments)
|
||||
{
|
||||
if (!segEnd.IsValid())
|
||||
continue;
|
||||
|
|
@ -785,11 +785,11 @@ OsrmRouter::ResultCode OsrmRouter::MakeTurnAnnotation(
|
|||
|
||||
auto startIdx = seg.m_pointStart;
|
||||
auto endIdx = seg.m_pointEnd;
|
||||
bool const needTime = (j == 0) || (j == n - 1);
|
||||
bool const needTime = (segmentIndex == 0) || (segmentIndex == numSegments - 1);
|
||||
|
||||
if (j == 0 && k == startK && segBegin.IsValid())
|
||||
if (segmentIndex == 0 && k == startK && segBegin.IsValid())
|
||||
startIdx = (seg.m_pointEnd > seg.m_pointStart) ? segBegin.m_pointStart : segBegin.m_pointEnd;
|
||||
if (j == n - 1 && k == endK - 1 && segEnd.IsValid())
|
||||
if (segmentIndex == numSegments - 1 && k == endK - 1 && segEnd.IsValid())
|
||||
endIdx = (seg.m_pointEnd > seg.m_pointStart) ? segEnd.m_pointEnd : segEnd.m_pointStart;
|
||||
|
||||
if (seg.m_pointEnd > seg.m_pointStart)
|
||||
|
|
@ -826,7 +826,7 @@ OsrmRouter::ResultCode OsrmRouter::MakeTurnAnnotation(
|
|||
times.push_back(Route::TTimeItem(points.size() - 1, estimatedTime));
|
||||
if (routingResult.targetEdge.segment.IsValid())
|
||||
{
|
||||
turnsDir.push_back(
|
||||
turnsDir.emplace_back(
|
||||
turns::TurnItem(static_cast<uint32_t>(points.size()) - 1, turns::TurnDirection::ReachedYourDestination));
|
||||
}
|
||||
turns::FixupTurns(points, turnsDir);
|
||||
|
|
|
|||
|
|
@ -22,6 +22,10 @@ using namespace routing::turns;
|
|||
namespace
|
||||
{
|
||||
double const kFeaturesNearTurnMeters = 3.0;
|
||||
size_t constexpr kMaxPointsCount = 7;
|
||||
double constexpr kMinDistMeters = 300.;
|
||||
size_t constexpr kNotSoCloseMaxPointsCount = 3;
|
||||
double constexpr kNotSoCloseMinDistMeters = 30.;
|
||||
|
||||
typedef vector<double> TGeomTurnCandidate;
|
||||
|
||||
|
|
@ -326,26 +330,24 @@ TurnDirection FindDirectionByAngle(vector<pair<double, TurnDirection>> const & l
|
|||
* \param segment is a ingoing or outgoing feature segment.
|
||||
* \param ft is a ingoing or outgoing feature.
|
||||
* \param junctionPoint is a junction point.
|
||||
* \param maxPointsCount returned poit could't be more than maxPointsCount poins away from junctionPoint
|
||||
* \param minDistMeters returned point should be minDistMeters away from junctionPoint if ft is long and consists of short segments
|
||||
* \param GetPointIndex is a function for getting points by index.
|
||||
* It defines a direction of following along a feature. So it differs for ingoing and outgoing cases.
|
||||
* It has following parameters:
|
||||
* - start is an index of the start point of a feature segment. For example, FtSeg::m_pointStart.
|
||||
* - end is an index of the end point of a feature segment. For example, FtSeg::m_pointEnd.
|
||||
* - shift is a number of points which shall be added to end or start index. After that
|
||||
* the sum reflects an index of a feature segment point which will be used for a turn calculation.
|
||||
* the sum reflects an index of a feature segment point which will be used for a turn calculation.
|
||||
* The sum shall belongs to a range [min(start, end), max(start, end)].
|
||||
* shift belongs to a range [0, abs(end - start)].
|
||||
* \return an ingoing or outgoing point for a turn calculation.
|
||||
*/
|
||||
m2::PointD GetPointForTurn(OsrmMappingTypes::FtSeg const & segment, FeatureType const & ft,
|
||||
m2::PointD const & junctionPoint,
|
||||
size_t (*GetPointIndex)(const size_t start, const size_t end, const size_t shift),
|
||||
size_t const maxPointsCount = 7, // An ingoing and outgoing point could be farther
|
||||
// then kMaxPointsCount points from the junctionPoint
|
||||
double const minDistMeters = 300. // If ft feature is long enough and consists of short segments
|
||||
// the point for turn generation is taken as the next point
|
||||
// along the route after kMinDistMeters.
|
||||
)
|
||||
size_t const maxPointsCount,
|
||||
double const minDistMeters,
|
||||
size_t (*GetPointIndex)(const size_t start, const size_t end, const size_t shift))
|
||||
{
|
||||
double curDistanceMeters = 0.;
|
||||
m2::PointD point = junctionPoint;
|
||||
|
|
@ -442,6 +444,16 @@ void GetPossibleTurns(Index const & index, NodeID node, m2::PointD const & ingoi
|
|||
return t1.angle < t2.angle;
|
||||
});
|
||||
}
|
||||
|
||||
size_t GetIngoingPointIndex(const size_t start, const size_t end, const size_t i)
|
||||
{
|
||||
return end > start ? end - i : end + i;
|
||||
}
|
||||
|
||||
size_t GetOutgoingPointIndex(const size_t start, const size_t end, const size_t i)
|
||||
{
|
||||
return end > start ? start + i : start - i;
|
||||
}
|
||||
} // namespace
|
||||
|
||||
namespace routing
|
||||
|
|
@ -729,20 +741,11 @@ void GetTurnDirection(Index const & index, TurnInfo & turnInfo, TurnItem & turn)
|
|||
outgoingFeature.GetPoint(turnInfo.m_outgoingSegment.m_pointStart)),
|
||||
kFeaturesNearTurnMeters, ());
|
||||
|
||||
auto const getIngoingPointIndex = [](const size_t start, const size_t end, const size_t i)
|
||||
{
|
||||
return end > start ? end - i : end + i;
|
||||
};
|
||||
auto const getOutgoingPointIndex = [](const size_t start, const size_t end, const size_t i)
|
||||
{
|
||||
return end > start ? start + i : start - i;
|
||||
};
|
||||
|
||||
m2::PointD const junctionPoint = ingoingFeature.GetPoint(turnInfo.m_ingoingSegment.m_pointEnd);
|
||||
m2::PointD const ingoingPoint = GetPointForTurn(turnInfo.m_ingoingSegment, ingoingFeature,
|
||||
junctionPoint, getIngoingPointIndex);
|
||||
junctionPoint, kMaxPointsCount, kMinDistMeters, GetIngoingPointIndex);
|
||||
m2::PointD const outgoingPoint = GetPointForTurn(turnInfo.m_outgoingSegment, outgoingFeature,
|
||||
junctionPoint, getOutgoingPointIndex);
|
||||
junctionPoint, kMaxPointsCount, kMinDistMeters, GetOutgoingPointIndex);
|
||||
|
||||
double const turnAngle = my::RadToDeg(PiMinusTwoVectorsAngle(junctionPoint, ingoingPoint, outgoingPoint));
|
||||
TurnDirection const intermediateDirection = IntermediateDirection(turnAngle);
|
||||
|
|
@ -773,10 +776,10 @@ void GetTurnDirection(Index const & index, TurnInfo & turnInfo, TurnItem & turn)
|
|||
GetPossibleTurns(index, turnInfo.m_ingoingNodeID, ingoingPointOneSegment, junctionPoint,
|
||||
turnInfo.m_routeMapping, nodes);
|
||||
|
||||
size_t const nodesSize = nodes.size();
|
||||
bool const hasMultiTurns = nodesSize > 1;
|
||||
size_t const numNodes = nodes.size();
|
||||
bool const hasMultiTurns = numNodes > 1;
|
||||
|
||||
if (nodesSize == 0)
|
||||
if (numNodes == 0)
|
||||
return;
|
||||
|
||||
if (!hasMultiTurns)
|
||||
|
|
@ -808,12 +811,9 @@ void GetTurnDirection(Index const & index, TurnInfo & turnInfo, TurnItem & turn)
|
|||
return;
|
||||
}
|
||||
|
||||
auto const notSoCloseToTheTurnPoint = GetPointForTurn(turnInfo.m_ingoingSegment, ingoingFeature, junctionPoint,
|
||||
kNotSoCloseMaxPointsCount, kNotSoCloseMinDistMeters, GetIngoingPointIndex);
|
||||
|
||||
size_t constexpr kMaxPointsCount = 3;
|
||||
double constexpr kMinDistMeters = 30.;
|
||||
auto const notSoCloseToTheTurnPoint = GetPointForTurn(turnInfo.m_ingoingSegment, ingoingFeature,
|
||||
junctionPoint, getIngoingPointIndex,
|
||||
kMaxPointsCount, kMinDistMeters);
|
||||
if (!KeepTurnByIngoingEdges(junctionPoint, notSoCloseToTheTurnPoint, outgoingPoint, hasMultiTurns,
|
||||
turnInfo.m_routeMapping, index))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -117,8 +117,6 @@ bool CheckRoundaboutExit(bool isIngoingEdgeRoundabout, bool isOutgoingEdgeRounda
|
|||
TurnDirection GetRoundaboutDirection(bool isIngoingEdgeRoundabout, bool isOutgoingEdgeRoundabout,
|
||||
bool isMultiTurnJunction, bool keepTurnByHighwayClass);
|
||||
|
||||
|
||||
|
||||
/*!
|
||||
* \brief GetTurnDirection makes a primary decision about turns on the route.
|
||||
* \param turnInfo is used for cashing some information while turn calculation.
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue