Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add check for empty or single undefined partition

Browse source
This commit is contained in:
Chumva 2019-07-08 15:21:47 +03:00
parent 6494050214
commit 5a0cfd46ae
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
OsmAnd-java/src/main/java/net/osmand/router/RouteStatisticsHelper.java
View file

@ -1,5 +1,10 @@
package net.osmand.router;
import net.osmand.binary.BinaryMapRouteReaderAdapter;
import net.osmand.binary.RouteDataObject;
import net.osmand.render.RenderingRuleSearchRequest;
import net.osmand.render.RenderingRulesStorage;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@ -8,11 +13,6 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import net.osmand.binary.BinaryMapRouteReaderAdapter;
import net.osmand.binary.RouteDataObject;
import net.osmand.render.RenderingRuleSearchRequest;
import net.osmand.render.RenderingRulesStorage;
public class RouteStatisticsHelper {
public static final String UNDEFINED_ATTR = "undefined";
@ -106,7 +106,10 @@ public class RouteStatisticsHelper {
for(String attributeName : attributeNames) {
RouteStatisticComputer statisticComputer =
new RouteStatisticComputer(currentRenderer, defaultRenderer, currentSearchRequest, defaultSearchRequest);
result.add(statisticComputer.computeStatistic(routeSegmentWithInclines, attributeName));
RouteStatistics routeStatistics = statisticComputer.computeStatistic(routeSegmentWithInclines, attributeName);
if (!routeStatistics.partition.isEmpty() && (routeStatistics.partition.size() != 1 || !routeStatistics.partition.containsKey(UNDEFINED_ATTR))) {
result.add(routeStatistics);
}
}
return result;