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

Merge pull request #2938 from bykoianko/master-bicycle-directions-first-appr

Browse source 
[bicycle routing] Making factory for creating LoadedPathSegment objects.
This commit is contained in:
ygorshenin 2016-04-21 16:05:25 +03:00
commit d860f248d0
9 changed files with 118 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
routing/loaded_path_segment.hpp
View file

@ -18,10 +18,6 @@ struct RoutingMapping;
struct RawPathData;
struct FeatureGraphNode;
namespace turns
{
using TSeg = OsrmMappingTypes::FtSeg;
/*!
* \brief The LoadedPathSegment struct is a representation of a single node path.
* It unpacks and stores information about path and road type flags.
@ -30,29 +26,31 @@ using TSeg = OsrmMappingTypes::FtSeg;
struct LoadedPathSegment
{
vector<m2::PointD> m_path;
vector<turns::SingleLaneInfo> m_lanes;
string m_name;
TEdgeWeight m_weight;
TNodeId m_nodeId;
ftypes::HighwayClass m_highwayClass;
bool m_onRoundabout;
bool m_isLink;
TEdgeWeight m_weight;
string m_name;
TNodeId m_nodeId;
vector<SingleLaneInfo> m_lanes;
// General constructor.
LoadedPathSegment(RoutingMapping & mapping, Index const & index,
RawPathData const & osrmPathSegment);
// Special constructor for side nodes. Splits OSRM node by information from the FeatureGraphNode.
LoadedPathSegment(RoutingMapping & mapping, Index const & index,
RawPathData const & osrmPathSegment, FeatureGraphNode const & startGraphNode,
FeatureGraphNode const & endGraphNode, bool isStartNode, bool isEndNode);
LoadedPathSegment()
{
Clear();
}
private:
// Load information about road, that described as the sequence of FtSegs and start/end indexes in
// in it. For the side case, it has information about start/end graph nodes.
void LoadPathGeometry(buffer_vector<TSeg, 8> const & buffer, size_t startIndex,
size_t endIndex, Index const & index, RoutingMapping & mapping,
FeatureGraphNode const & startGraphNode,
FeatureGraphNode const & endGraphNode, bool isStartNode, bool isEndNode);
void Clear()
{
m_path.clear();
m_lanes.clear();
m_name.clear();
m_weight = 0;
m_nodeId = 0;
m_highwayClass = ftypes::HighwayClass::Undefined;
m_onRoundabout = false;
m_isLink = false;
}
};
using TUnpackedPathSegments = vector<LoadedPathSegment>;
} // namespace routing
} // namespace turns

112
routing/loaded_path_segment.cpp → routing/osrm_path_segment_factory.cpp
View file

@ -1,4 +1,4 @@
#include "routing/loaded_path_segment.hpp"
#include "routing/osrm_path_segment_factory.hpp"
#include "routing/routing_mapping.hpp"
#include "indexer/feature.hpp"
@ -8,43 +8,18 @@
#include "base/buffer_vector.hpp"
namespace routing
{
namespace turns
namespace
{
// Osrm multiples seconds to 10, so we need to divide it back.
double constexpr kOSRMWeightToSecondsMultiplier = 1. / 10.;
LoadedPathSegment::LoadedPathSegment(RoutingMapping & mapping, Index const & index,
RawPathData const & osrmPathSegment)
: m_highwayClass(ftypes::HighwayClass::Undefined)
, m_onRoundabout(false)
, m_isLink(false)
, m_weight(osrmPathSegment.segmentWeight * kOSRMWeightToSecondsMultiplier)
, m_nodeId(osrmPathSegment.node)
{
buffer_vector<TSeg, 8> buffer;
mapping.m_segMapping.ForEachFtSeg(osrmPathSegment.node, MakeBackInsertFunctor(buffer));
if (buffer.empty())
{
LOG(LERROR, ("Can't unpack geometry for map:", mapping.GetCountryName(), " node: ",
osrmPathSegment.node));
alohalytics::Stats::Instance().LogEvent(
"RouteTracking_UnpackingError",
{{"node", strings::to_string(osrmPathSegment.node)},
{"map", mapping.GetCountryName()},
{"version", strings::to_string(mapping.GetMwmId().GetInfo()->GetVersion())}});
return;
}
LoadPathGeometry(buffer, 0, buffer.size(), index, mapping, FeatureGraphNode(), FeatureGraphNode(),
false /* isStartNode */, false /*isEndNode*/);
}
using TSeg = routing::OsrmMappingTypes::FtSeg;
void LoadedPathSegment::LoadPathGeometry(buffer_vector<TSeg, 8> const & buffer, size_t startIndex,
size_t endIndex, Index const & index, RoutingMapping & mapping,
FeatureGraphNode const & startGraphNode,
FeatureGraphNode const & endGraphNode, bool isStartNode,
bool isEndNode)
void LoadPathGeometry(buffer_vector<TSeg, 8> const & buffer, size_t startIndex,
size_t endIndex, Index const & index, routing::RoutingMapping & mapping,
routing::FeatureGraphNode const & startGraphNode,
routing::FeatureGraphNode const & endGraphNode, bool isStartNode,
bool isEndNode, routing::LoadedPathSegment & loadPathGeometry)
{
ASSERT_LESS(startIndex, endIndex, ());
ASSERT_LESS_OR_EQUAL(endIndex, buffer.size(), ());
@ -54,7 +29,7 @@ void LoadedPathSegment::LoadPathGeometry(buffer_vector<TSeg, 8> const & buffer,
auto const & segment = buffer[k];
if (!segment.IsValid())
{
m_path.clear();
loadPathGeometry.m_path.clear();
return;
}
// Load data from drive.
@ -75,13 +50,13 @@ void LoadedPathSegment::LoadPathGeometry(buffer_vector<TSeg, 8> const & buffer,
if (startIdx < endIdx)
{
for (auto idx = startIdx; idx <= endIdx; ++idx)
m_path.push_back(ft.GetPoint(idx));
loadPathGeometry.m_path.push_back(ft.GetPoint(idx));
}
else
{
// I use big signed type because endIdx can be 0.
for (int64_t idx = startIdx; idx >= static_cast<int64_t>(endIdx); --idx)
m_path.push_back(ft.GetPoint(idx));
loadPathGeometry.m_path.push_back(ft.GetPoint(idx));
}
// Load lanes if it is a last segment before junction.
@ -97,31 +72,53 @@ void LoadedPathSegment::LoadPathGeometry(buffer_vector<TSeg, 8> const & buffer,
directionType = (startIdx < endIdx) ? Metadata::FMD_TURN_LANES_FORWARD
: Metadata::FMD_TURN_LANES_BACKWARD;
}
ParseLanes(md.Get(directionType), m_lanes);
ParseLanes(md.Get(directionType), loadPathGeometry.m_lanes);
}
// Calculate node flags.
m_onRoundabout |= ftypes::IsRoundAboutChecker::Instance()(ft);
m_isLink |= ftypes::IsLinkChecker::Instance()(ft);
m_highwayClass = ftypes::GetHighwayClass(ft);
loadPathGeometry.m_onRoundabout |= ftypes::IsRoundAboutChecker::Instance()(ft);
loadPathGeometry.m_isLink |= ftypes::IsLinkChecker::Instance()(ft);
loadPathGeometry.m_highwayClass = ftypes::GetHighwayClass(ft);
string name;
ft.GetName(FeatureType::DEFAULT_LANG, name);
if (!name.empty())
m_name = name;
loadPathGeometry.m_name = name;
}
}
} // namespace
LoadedPathSegment::LoadedPathSegment(RoutingMapping & mapping, Index const & index,
RawPathData const & osrmPathSegment,
FeatureGraphNode const & startGraphNode,
FeatureGraphNode const & endGraphNode, bool isStartNode,
bool isEndNode)
: m_highwayClass(ftypes::HighwayClass::Undefined)
, m_onRoundabout(false)
, m_isLink(false)
, m_weight(0)
, m_nodeId(osrmPathSegment.node)
namespace routing
{
void OsrmPathSegmentFactory(RoutingMapping & mapping, Index const & index,
RawPathData const & osrmPathSegment, LoadedPathSegment & loadedPathSegment)
{
loadedPathSegment.Clear();
buffer_vector<TSeg, 8> buffer;
mapping.m_segMapping.ForEachFtSeg(osrmPathSegment.node, MakeBackInsertFunctor(buffer));
loadedPathSegment.m_weight = osrmPathSegment.segmentWeight * kOSRMWeightToSecondsMultiplier;
loadedPathSegment.m_nodeId = osrmPathSegment.node;
if (buffer.empty())
{
LOG(LERROR, ("Can't unpack geometry for map:", mapping.GetCountryName(), " node: ",
osrmPathSegment.node));
alohalytics::Stats::Instance().LogEvent(
"RouteTracking_UnpackingError",
{{"node", strings::to_string(osrmPathSegment.node)},
{"map", mapping.GetCountryName()},
{"version", strings::to_string(mapping.GetMwmId().GetInfo()->GetVersion())}});
return;
}
LoadPathGeometry(buffer, 0, buffer.size(), index, mapping, FeatureGraphNode(), FeatureGraphNode(),
false /* isStartNode */, false /*isEndNode*/, loadedPathSegment);
}
void OsrmPathSegmentFactory(RoutingMapping & mapping, Index const & index, RawPathData const & osrmPathSegment,
FeatureGraphNode const & startGraphNode, FeatureGraphNode const & endGraphNode,
bool isStartNode, bool isEndNode, LoadedPathSegment & loadedPathSegment)
{
ASSERT(isStartNode || isEndNode, ("This function process only corner cases."));
loadedPathSegment.Clear();
loadedPathSegment.m_nodeId = osrmPathSegment.node;
if (!startGraphNode.segment.IsValid() || !endGraphNode.segment.IsValid())
return;
buffer_vector<TSeg, 8> buffer;
@ -153,7 +150,7 @@ LoadedPathSegment::LoadedPathSegment(RoutingMapping & mapping, Index const & ind
: startGraphNode.node.reverse_offset;
// Sum because weights in forward/backward_weight fields are negative. Look osrm_helpers for
// more info.
m_weight = wholeWeight + forwardWeight + backwardWeight;
loadedPathSegment.m_weight = wholeWeight + forwardWeight + backwardWeight;
}
else
{
@ -164,16 +161,15 @@ LoadedPathSegment::LoadedPathSegment(RoutingMapping & mapping, Index const & ind
node = &endGraphNode.node;
if (node)
{
m_weight = (osrmPathSegment.node == node->forward_weight)
? node->GetForwardWeightPlusOffset() : node->GetReverseWeightPlusOffset();
loadedPathSegment.m_weight = (osrmPathSegment.node == node->forward_weight)
? node->GetForwardWeightPlusOffset() : node->GetReverseWeightPlusOffset();
}
}
size_t startIndex = isStartNode ? findIntersectingSeg(startGraphNode.segment) : 0;
size_t endIndex = isEndNode ? findIntersectingSeg(endGraphNode.segment) + 1 : buffer.size();
LoadPathGeometry(buffer, startIndex, endIndex, index, mapping, startGraphNode, endGraphNode, isStartNode,
isEndNode);
m_weight *= kOSRMWeightToSecondsMultiplier;
isEndNode, loadedPathSegment);
loadedPathSegment.m_weight *= kOSRMWeightToSecondsMultiplier;
}
} // namespace routing
} // namespace turns

18
routing/osrm_path_segment_factory.hpp Normal file
View file

@ -0,0 +1,18 @@
#pragma once
#include "routing/loaded_path_segment.hpp"
namespace routing
{
struct FeatureGraphNode;
struct RawPathData;
struct RoutingMapping;
// General constructor.
void OsrmPathSegmentFactory(RoutingMapping & mapping, Index const & index,
RawPathData const & osrmPathSegment, LoadedPathSegment & loadedPathSegment);
// Special constructor for side nodes. Splits OSRM node by information from the FeatureGraphNode.
void OsrmPathSegmentFactory(RoutingMapping & mapping, Index const & index, RawPathData const & osrmPathSegment,
FeatureGraphNode const & startGraphNode, FeatureGraphNode const & endGraphNode,
bool isStartNode, bool isEndNode, LoadedPathSegment & loadedPathSegment);
} // namespace routing

20
routing/osrm_router.cpp
View file

@ -3,6 +3,7 @@
#include "routing/online_cross_fetcher.hpp"
#include "routing/osrm2feature_map.hpp"
#include "routing/osrm_helpers.hpp"
#include "routing/osrm_path_segment_factory.hpp"
#include "routing/osrm_router.hpp"
#include "routing/turns_generator.hpp"
@ -63,7 +64,8 @@ using RawRouteData = InternalRouteResult;
class OSRMRoutingResultGraph : public turns::IRoutingResultGraph
{
public:
virtual vector<turns::LoadedPathSegment> const & GetSegments() const override
// turns::IRoutingResultGraph overrides:
virtual TUnpackedPathSegments const & GetSegments() const override
{
return m_loadedSegments;
}
@ -171,20 +173,21 @@ public:
for (auto const & pathSegments : m_rawResult.unpackedPathSegments)
{
auto numSegments = pathSegments.size();
m_loadedSegments.reserve(numSegments);
m_loadedSegments.resize(numSegments);
for (size_t segmentIndex = 0; segmentIndex < numSegments; ++segmentIndex)
{
bool isStartNode = (segmentIndex == 0);
bool isEndNode = (segmentIndex == numSegments - 1);
if (isStartNode || isEndNode)
{
m_loadedSegments.emplace_back(m_routingMapping, m_index, pathSegments[segmentIndex],
m_rawResult.sourceEdge, m_rawResult.targetEdge, isStartNode,
isEndNode);
OsrmPathSegmentFactory(m_routingMapping, m_index,
pathSegments[segmentIndex], m_rawResult.sourceEdge,
m_rawResult.targetEdge, isStartNode, isEndNode, m_loadedSegments[segmentIndex]);
}
else
{
m_loadedSegments.emplace_back(m_routingMapping, m_index, pathSegments[segmentIndex]);
OsrmPathSegmentFactory(m_routingMapping, m_index,
pathSegments[segmentIndex], m_loadedSegments[segmentIndex]);
}
}
}
@ -192,7 +195,7 @@ public:
~OSRMRoutingResultGraph() {}
private:
vector<turns::LoadedPathSegment> m_loadedSegments;
TUnpackedPathSegments m_loadedSegments;
RawRoutingResult m_rawResult;
Index const & m_index;
RoutingMapping & m_routingMapping;
@ -562,7 +565,4 @@ IRouter::ResultCode OsrmRouter::FindPhantomNodes(m2::PointD const & point,
getter.MakeResult(res, maxCount);
return NoError;
}
} // namespace routing

3
routing/routing.pro
View file

@ -21,13 +21,13 @@ SOURCES += \
cross_mwm_router.cpp \
cross_routing_context.cpp \
features_road_graph.cpp \
loaded_path_segment.cpp \
nearest_edge_finder.cpp \
online_absent_fetcher.cpp \
online_cross_fetcher.cpp \
osrm2feature_map.cpp \
osrm_engine.cpp \
osrm_helpers.cpp \
osrm_path_segment_factory.cpp \
osrm_router.cpp \
pedestrian_directions.cpp \
pedestrian_model.cpp \
@ -66,6 +66,7 @@ HEADERS += \
osrm_data_facade.hpp \
osrm_engine.hpp \
osrm_helpers.hpp \
osrm_path_segment_factory.hpp \
osrm_router.hpp \
pedestrian_directions.hpp \
pedestrian_model.hpp \

2
routing/routing_result_graph.hpp
View file

@ -17,7 +17,7 @@ namespace turns
class IRoutingResultGraph
{
public:
virtual vector<LoadedPathSegment> const & GetSegments() const = 0;
virtual TUnpackedPathSegments const & GetSegments() const = 0;
virtual void GetPossibleTurns(TNodeId node, m2::PointD const & ingoingPoint,
m2::PointD const & junctionPoint,
size_t & ingoingCount,

3
routing/turns_generator.cpp
View file

@ -662,7 +662,8 @@ void GetTurnDirection(IRoutingResultGraph const & result, TurnInfo & turnInfo, T
}
}
size_t CheckUTurnOnRoute(vector<LoadedPathSegment> const & segments, size_t currentSegment, TurnItem & turn)
size_t CheckUTurnOnRoute(TUnpackedPathSegments const & segments,
size_t currentSegment, TurnItem & turn)
{
size_t constexpr kUTurnLookAhead = 3;
double constexpr kUTurnHeadingSensitivity = math::pi / 10.0;

3
routing/turns_generator.hpp
View file

@ -135,6 +135,7 @@ void GetTurnDirection(IRoutingResultGraph const & result, turns::TurnInfo & turn
* Returns 0 if there is no UTurn.
* Warning! currentSegment must be greater than 0.
*/
size_t CheckUTurnOnRoute(vector<LoadedPathSegment> const & segments, size_t currentSegment, TurnItem & turn);
size_t CheckUTurnOnRoute(TUnpackedPathSegments const & segments,
size_t currentSegment, TurnItem & turn);
} // namespace routing
} // namespace turns

12
xcode/routing/routing.xcodeproj/project.pbxproj
View file

@ -7,10 +7,11 @@
objects = {
/* Begin PBXBuildFile section */
56099E281CC7C97D00A7772A /* loaded_path_segment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56099E241CC7C97D00A7772A /* loaded_path_segment.cpp */; };
56099E291CC7C97D00A7772A /* loaded_path_segment.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56099E251CC7C97D00A7772A /* loaded_path_segment.hpp */; };
56099E2A1CC7C97D00A7772A /* routing_result_graph.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56099E261CC7C97D00A7772A /* routing_result_graph.hpp */; };
56099E2B1CC7C97D00A7772A /* turn_candidate.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56099E271CC7C97D00A7772A /* turn_candidate.hpp */; };
56099E2E1CC8FBDA00A7772A /* osrm_path_segment_factory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56099E2C1CC8FBDA00A7772A /* osrm_path_segment_factory.cpp */; };
56099E2F1CC8FBDA00A7772A /* osrm_path_segment_factory.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56099E2D1CC8FBDA00A7772A /* osrm_path_segment_factory.hpp */; };
563B91C51CC4F1DC00222BC1 /* bicycle_model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 563B91C31CC4F1DC00222BC1 /* bicycle_model.cpp */; };
563B91C61CC4F1DC00222BC1 /* bicycle_model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 563B91C41CC4F1DC00222BC1 /* bicycle_model.hpp */; };
670B84C01A9381D900CE4492 /* cross_routing_context.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670B84BE1A9381D900CE4492 /* cross_routing_context.cpp */; };
@ -182,10 +183,11 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
56099E241CC7C97D00A7772A /* loaded_path_segment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = loaded_path_segment.cpp; sourceTree = "<group>"; };
56099E251CC7C97D00A7772A /* loaded_path_segment.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = loaded_path_segment.hpp; sourceTree = "<group>"; };
56099E261CC7C97D00A7772A /* routing_result_graph.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = routing_result_graph.hpp; sourceTree = "<group>"; };
56099E271CC7C97D00A7772A /* turn_candidate.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = turn_candidate.hpp; sourceTree = "<group>"; };
56099E2C1CC8FBDA00A7772A /* osrm_path_segment_factory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = osrm_path_segment_factory.cpp; path = ../../routing/osrm_path_segment_factory.cpp; sourceTree = "<group>"; };
56099E2D1CC8FBDA00A7772A /* osrm_path_segment_factory.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = osrm_path_segment_factory.hpp; path = ../../routing/osrm_path_segment_factory.hpp; sourceTree = "<group>"; };
563B91C31CC4F1DC00222BC1 /* bicycle_model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bicycle_model.cpp; sourceTree = "<group>"; };
563B91C41CC4F1DC00222BC1 /* bicycle_model.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = bicycle_model.hpp; sourceTree = "<group>"; };
670B84BE1A9381D900CE4492 /* cross_routing_context.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cross_routing_context.cpp; sourceTree = "<group>"; };
@ -521,6 +523,8 @@
675343EF1A3F640D00A0A8C3 = {
isa = PBXGroup;
children = (
56099E2C1CC8FBDA00A7772A /* osrm_path_segment_factory.cpp */,
56099E2D1CC8FBDA00A7772A /* osrm_path_segment_factory.hpp */,
670D05A61B0E02560013A7AC /* defaults.xcconfig */,
6742AD251C68A923009CB89E /* libs */,
675343FA1A3F640D00A0A8C3 /* routing */,
@ -545,7 +549,6 @@
675343FA1A3F640D00A0A8C3 /* routing */ = {
isa = PBXGroup;
children = (
56099E241CC7C97D00A7772A /* loaded_path_segment.cpp */,
56099E251CC7C97D00A7772A /* loaded_path_segment.hpp */,
56099E261CC7C97D00A7772A /* routing_result_graph.hpp */,
56099E271CC7C97D00A7772A /* turn_candidate.hpp */,
@ -673,6 +676,7 @@
A1616E2E1B6B60B3003F078E /* astar_progress.hpp in Headers */,
670EE5721B664796001E8064 /* directions_engine.hpp in Headers */,
A1876BC71BB19C4300C9C743 /* speed_camera.hpp in Headers */,
56099E2F1CC8FBDA00A7772A /* osrm_path_segment_factory.hpp in Headers */,
67C7D42A1B4EB48F00FE41AA /* car_model.hpp in Headers */,
670D049F1B0B4A970013A7AC /* nearest_edge_finder.hpp in Headers */,
A120B34F1B4A7C0A002F3808 /* online_absent_fetcher.hpp in Headers */,
@ -850,6 +854,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
56099E2E1CC8FBDA00A7772A /* osrm_path_segment_factory.cpp in Sources */,
675344201A3F644F00A0A8C3 /* vehicle_model.cpp in Sources */,
A1616E2B1B6B60AB003F078E /* router_delegate.cpp in Sources */,
6741AA9C1BF35331002C974C /* turns_notification_manager.cpp in Sources */,
@ -873,7 +878,6 @@
674A28B11B1605D2001A525C /* osrm_engine.cpp in Sources */,
674F9BD41B0A580E00704FFA /* road_graph.cpp in Sources */,
67AB92E61B7B3E6E00AB5194 /* turns_tts_text.cpp in Sources */,
56099E281CC7C97D00A7772A /* loaded_path_segment.cpp in Sources */,
6753441E1A3F644F00A0A8C3 /* turns.cpp in Sources */,
670B84C01A9381D900CE4492 /* cross_routing_context.cpp in Sources */,
A120B3501B4A7C0A002F3808 /* routing_algorithm.cpp in Sources */,