Skip to content

Commit

Permalink
Code review fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
vng authored and oxidase committed Nov 16, 2017
1 parent 8fa98ed commit a53794f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
6 changes: 2 additions & 4 deletions include/extractor/edge_based_node.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,10 @@ struct EdgeBasedNode
{
GeometryID geometry_id;
ComponentID component_id;
AnnotationID annotation_id : 31;
bool segregated : 1;
std::uint32_t annotation_id : 31;
std::uint32_t segregated : 1;
};

static_assert(sizeof(EdgeBasedNode) == 3 * 4, "Should be 3 * sizeof(uint32_t)");

} // namespace extractor
} // namespace osrm

Expand Down
5 changes: 5 additions & 0 deletions include/extractor/extractor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,11 @@ class Extractor
const std::string &path,
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);
};
}
Expand Down

0 comments on commit a53794f

Please sign in to comment.