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

clean

Browse source
This commit is contained in:
MadWasp79 2019-12-09 16:01:07 +02:00
parent b43fb6332a
commit 2bec1a70ea
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
OsmAnd-java/src/main/java/net/osmand/router/GeneralRouter.java
View file

@ -58,9 +58,6 @@ public class GeneralRouter implements VehicleRouter {
Map<String, Map<int[], Float>> obstacleCache; Map<String, Map<int[], Float>> obstacleCache;
Map<String, Map<int[], Float>> penaltyCache; Map<String, Map<int[], Float>> penaltyCache;
int count = 0;
int count2 = 0;
private Map<RouteRegion, Map<Integer, Integer>> regionConvert = new LinkedHashMap<RouteRegion, Map<Integer,Integer>>(); private Map<RouteRegion, Map<Integer, Integer>> regionConvert = new LinkedHashMap<RouteRegion, Map<Integer,Integer>>();
// cached values // cached values
@ -376,7 +373,6 @@ public class GeneralRouter implements VehicleRouter {
obstacleCache.get(region).put(pointTypes, obst); obstacleCache.get(region).put(pointTypes, obst);
return obst; return obst;
} }
return 0; return 0;
} }
@ -744,13 +740,10 @@ public class GeneralRouter implements VehicleRouter {
} }
public float evaluateFloat(RouteDataObject ro, float defValue) { public float evaluateFloat(RouteDataObject ro, float defValue) {
Object o = evaluate(ro); Object o = evaluate(ro);
if(!(o instanceof Number)) { if(!(o instanceof Number)) {
return defValue; return defValue;
} }
//System.out.println(String.format("RDA %s, val: %.3f", ro.types.toString(), ((Number)o).floatValue()));
return ((Number)o).floatValue(); return ((Number)o).floatValue();
} }