organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

[routing][generator] Fixed raw osrm node -> feature index.

Browse source
This commit is contained in:
Denis Koronchik 2014-09-11 13:20:58 +03:00 • committed by Alex Zolotarev
parent 7224565856
commit ac916226a1
2 changed files with 41 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
3party/osrm/osrm-backend/Contractor/EdgeBasedGraphFactory.cpp
View file

@ -505,13 +505,17 @@ void EdgeBasedGraphFactory::GenerateEdgeBasedNodeData()
const std::vector<GeometryCompressor::CompressedNode> & via_nodes = m_geometry_compressor.GetBucketReference(current_edge);
assert(via_nodes.size() > 0);
std::vector< std::pair< NodeID, FixedPointCoordinate > > nodes;
if (via_nodes.front().first != current_node)
nodes.emplace_back(current_node, FixedPointCoordinate(m_node_info_list[current_node].lat, m_node_info_list[current_node].lon));
for (auto n : via_nodes)
nodes.emplace_back(n.first, FixedPointCoordinate(m_node_info_list[n.first].lat, m_node_info_list[n.first].lon));
if (via_nodes.back().first != target)
nodes.emplace_back(target, FixedPointCoordinate(m_node_info_list[target].lat, m_node_info_list[target].lon));
for (uint32_t i = 0; i < nodes.size() - 1; ++i)
for (uint32_t i = 1; i < nodes.size(); ++i)
{
auto n1 = nodes[i];
auto n2 = nodes[i + 1];
auto n1 = nodes[i - 1];
auto n2 = nodes[i];
if (n1.first == n2.first)
{

46
generator/routing_generator.cpp
View file

@ -71,7 +71,6 @@ void GenerateNodesInfo(string const & mwmName, string const & osrmName)
{
uint32_t segId = 0;
OsrmFtSegMapping::FtSegVectorT vec;
vec.resize(data.m_segments.size());
for (auto seg : data.m_segments)
{
@ -93,6 +92,7 @@ void GenerateNodesInfo(string const & mwmName, string const & osrmName)
ft.ParseGeometry(FeatureType::BEST_GEOMETRY);
int32_t indicies[2] = {-1, -1};
double minDist[2] = {numeric_limits<double>::max(), numeric_limits<double>::max()};
for (uint32_t j = 0; j < ft.GetPointsCount(); ++j)
{
@ -101,12 +101,11 @@ void GenerateNodesInfo(string const & mwmName, string const & osrmName)
for (uint32_t k = 0; k < 2; ++k)
{
double const dist = ms::DistanceOnEarth(pts[k].y, pts[k].x, lat, lon);
//LOG(LINFO, ("Distance: ", dist));
if (dist <= EQUAL_POINT_RADIUS_M)
if (dist <= EQUAL_POINT_RADIUS_M && dist < minDist[k])
{
//ASSERT_EQUAL(indicies[k], -1, ());
indicies[k] = j;
minDist[k] = dist;
}
}
}
@ -115,12 +114,35 @@ void GenerateNodesInfo(string const & mwmName, string const & osrmName)
if (indicies[0] != -1 && indicies[1] != -1)
{
found++;
ASSERT_NOT_EQUAL(indicies[0], indicies[1], ());
OsrmFtSegMapping::FtSeg & segData = vec[segId++];
segData.m_fid = fID;
segData.m_pointEnd = indicies[1];
segData.m_pointStart = indicies[0];
mapping.Append(nodeId++, vec);
//LOG(LINFO, ("i1: ", indicies[0], " i2: ", indicies[1], " wayId: ", seg.wayId));
//CHECK(indicies[0] != indicies[1], ());
/*bool canMerge = !vec.empty();
if (canMerge)
{
if (vec.back().m_fid == fID)
{
canMerge = true;
OsrmFtSegMapping::FtSeg & seg = vec.back();
if (indicies[0] == seg.m_pointEnd)
seg.m_pointEnd = indicies[1];
else
{
if (indicies[1] == seg.m_pointStart)
seg.m_pointStart = indicies[0];
else
canMerge = false;
}
}
else
canMerge = false;
}
if (!canMerge)*/
vec.emplace_back(fID, indicies[0], indicies[1]);
}
else
{
@ -135,9 +157,9 @@ void GenerateNodesInfo(string const & mwmName, string const & osrmName)
LOG(LINFO, ("p", j, ": ", lat, ", ", lon, " Dist1: ", dist1, " Dist2: ", dist2));
}
}
}
mapping.Append(nodeId++, vec);
}
LOG(LINFO, ("Found: ", found, " All: ", all));