Add number of nontransit crossings to RouteWeight, add penality

1 files changed, 11 insertions, 2 deletions

diff --git a/routing/route_weight.cpp b/routing/route_weight.cpp
index f962b6d345..a8645f457d 100644
--- a/routing/route_weight.cpp
+++ b/routing/route_weight.cpp
@@ -1,17 +1,26 @@
 #include "routing/route_weight.hpp"
 
+#include "routing/cross_mwm_connector.hpp"
+
 using namespace std;
 
 namespace routing
 {
+double RouteWeight::ToCrossMwmWeight() const
+{
+  if (m_nontransitCross > 0)
+    return CrossMwmConnector::kNoRoute;
+  return GetWeight();
+}
+
 ostream & operator<<(ostream & os, RouteWeight const & routeWeight)
 {
-  os << routeWeight.GetWeight();
+  os << "(" << routeWeight.GetNontransitCross() << ", " << routeWeight.GetWeight() << ")";
   return os;
 }
 
 RouteWeight operator*(double lhs, RouteWeight const & rhs)
 {
-  return RouteWeight(lhs * rhs.GetWeight());
+  return RouteWeight(lhs * rhs.GetWeight(), rhs.GetNontransitCross());
 }
 }  // namespace routing