From 47bd168027e7e22d495e05dd0f66e54044013b5f Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 21 May 2016 20:00:22 +0200 Subject: [PATCH] revert tests --- .../net/osmand/plus/routing/RouteCalculationResult.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java b/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java index 5872818c5f..6392265a9a 100644 --- a/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java +++ b/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java @@ -813,11 +813,9 @@ public class RouteCalculationResult { cacheAgreggatedDirections = new ArrayList(); RouteDirectionInfo p = null; for(RouteDirectionInfo i : list) { -// if(p == null || !i.getTurnType().isSkipToSpeak() || -// (!Algorithms.objectEquals(p.getRef(), i.getRef()) && -// !Algorithms.objectEquals(p.getStreetName(), i.getStreetName()))) { -// Just a temporary test - if(!i.getTurnType().isSkipToSpeak()) { + if(p == null || !i.getTurnType().isSkipToSpeak() || + (!Algorithms.objectEquals(p.getRef(), i.getRef()) && + !Algorithms.objectEquals(p.getStreetName(), i.getStreetName()))) { p = new RouteDirectionInfo(i.getAverageSpeed(), i.getTurnType()); p.routePointOffset = i.routePointOffset; p.routeEndPointOffset = i.routeEndPointOffset;