Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indexer/ftypes_matcher.cpp2
-rw-r--r--routing/bicycle_directions.cpp8
2 files changed, 8 insertions, 2 deletions
diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp
index f28b169997..e0b114bc71 100644
--- a/indexer/ftypes_matcher.cpp
+++ b/indexer/ftypes_matcher.cpp
@@ -62,6 +62,8 @@ public:
m_map[c.GetTypeByPath({"highway", "steps"})] = ftypes::HighwayClass::Pedestrian;
m_map[c.GetTypeByPath({"highway", "cycleway"})] = ftypes::HighwayClass::Pedestrian;
m_map[c.GetTypeByPath({"highway", "path"})] = ftypes::HighwayClass::Pedestrian;
+ m_map[c.GetTypeByPath({"highway", "construction"})] = ftypes::HighwayClass::Pedestrian;
+
}
ftypes::HighwayClass Get(uint32_t t) const
diff --git a/routing/bicycle_directions.cpp b/routing/bicycle_directions.cpp
index 9a8798dadc..364619a362 100644
--- a/routing/bicycle_directions.cpp
+++ b/routing/bicycle_directions.cpp
@@ -266,8 +266,12 @@ void BicycleDirectionsEngine::GetSegmentRangeAndAdjacentEdges(
continue;
auto const highwayClass = ftypes::GetHighwayClass(feature::TypesHolder(*ft));
- ASSERT_NOT_EQUAL(highwayClass, ftypes::HighwayClass::Error, ());
- ASSERT_NOT_EQUAL(highwayClass, ftypes::HighwayClass::Undefined, ());
+ ASSERT_NOT_EQUAL(
+ highwayClass, ftypes::HighwayClass::Error,
+ (mercator::ToLatLon(edge.GetStartPoint()), mercator::ToLatLon(edge.GetEndPoint())));
+ ASSERT_NOT_EQUAL(
+ highwayClass, ftypes::HighwayClass::Undefined,
+ (mercator::ToLatLon(edge.GetStartPoint()), mercator::ToLatLon(edge.GetEndPoint())));
bool const isLink = ftypes::IsLinkChecker::Instance()(*ft);