From c846e7542cf0aa60bd7ccc476d8d0709e6705b89 Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Wed, 8 Apr 2020 10:46:28 +0300 Subject: [PATCH] [routing] Switching on access:conditional by preventing deserialization. --- routing/road_access.cpp | 8 ++++++++ routing/road_access_serialization.hpp | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/routing/road_access.cpp b/routing/road_access.cpp index 1bf3052a09..8d10a54b2a 100644 --- a/routing/road_access.cpp +++ b/routing/road_access.cpp @@ -55,6 +55,10 @@ pair RoadAccess::GetAccess(uint32_t fe time_t momentInTime) const { auto const itConditional = m_wayToAccessConditional.find(featureId); + // @TODO This check should be removed when access:conditional is switch on. + CHECK(m_pointToAccessConditional.empty(), + ("access:conditional is switched off now but m_pointToAccessConditional is not empty.", + m_pointToAccessConditional.size())); if (itConditional != m_wayToAccessConditional.cend()) { auto const & conditional = itConditional->second; @@ -75,6 +79,10 @@ pair RoadAccess::GetAccess(RoadPoint c time_t momentInTime) const { auto const itConditional = m_pointToAccessConditional.find(point); + // @TODO This check should be removed when access:conditional is switch on. + CHECK(m_pointToAccessConditional.empty(), + ("access:conditional is switched off now but m_pointToAccessConditional is not empty.", + m_pointToAccessConditional.size())); if (itConditional != m_pointToAccessConditional.cend()) { auto const & conditional = itConditional->second; diff --git a/routing/road_access_serialization.hpp b/routing/road_access_serialization.hpp index ccbc1fae62..aa93bbfcc6 100644 --- a/routing/road_access_serialization.hpp +++ b/routing/road_access_serialization.hpp @@ -69,7 +69,11 @@ public: case Header::WithAccessConditional: { DeserializeAccess(src, vehicleType, roadAccess); - DeserializeAccessConditional(src, vehicleType, roadAccess); + // access:conditional should be switch off for release 10.0 and probably for the next one. + // It means that they should be switch off for cross_mwm section generation and for runtime. + // To switch on access:conditional the line below should be uncommented. + // Also tests in routing/routing_tests/road_access_test.cpp should be uncommented. + // DeserializeAccessConditional(src, vehicleType, roadAccess); break; } default: UNREACHABLE();