Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Code review fixes.

Browse Source
This commit is contained in:
vng 2017-11-13 13:42:28 +03:00 committed by Michael Krasnyk
parent 8fa98ed27d
commit a53794f864
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/extractor/edge_based_node.hpp
View File

@ -12,12 +12,10 @@ struct EdgeBasedNode
{ {
GeometryID geometry_id; GeometryID geometry_id;
ComponentID component_id; ComponentID component_id;
AnnotationID annotation_id : 31; std::uint32_t annotation_id : 31;
bool segregated : 1; std::uint32_t segregated : 1;
}; };
static_assert(sizeof(EdgeBasedNode) == 3 * 4, "Should be 3 * sizeof(uint32_t)");
} // namespace extractor } // namespace extractor
} // namespace osrm } // namespace osrm

5
include/extractor/extractor.hpp
View File

@ -103,6 +103,11 @@ class Extractor
const std::string &path, const std::string &path,
std::vector<ConditionalTurnRestriction> &conditional_turn_restrictions); std::vector<ConditionalTurnRestriction> &conditional_turn_restrictions);
// Find all "segregated" edges, e.g. edges that can be skipped in turn instructions.
// The main cases are:
// - middle edges between two osm ways in one logic road (U-turn)
// - staggered intersections (X-cross)
// - square/circle intersections
std::unordered_set<EdgeID> FindSegregatedNodes(NodeBasedGraphFactory &factory); std::unordered_set<EdgeID> FindSegregatedNodes(NodeBasedGraphFactory &factory);
}; };
} }