From f6473011f824485f97c623315b4d35c4763b899d Mon Sep 17 00:00:00 2001 From: MadWasp79 Date: Fri, 19 Jun 2020 16:46:33 +0300 Subject: [PATCH] cleaning --- .../java/net/osmand/binary/BinaryMapRouteReaderAdapter.java | 5 ----- .../main/java/net/osmand/router/RoutingConfiguration.java | 2 +- .../src/main/java/net/osmand/router/RoutingContext.java | 3 --- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapRouteReaderAdapter.java b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapRouteReaderAdapter.java index a305d70204..178f515b10 100644 --- a/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapRouteReaderAdapter.java +++ b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapRouteReaderAdapter.java @@ -173,11 +173,6 @@ public class BinaryMapRouteReaderAdapter { return tag; } - //TODO implement - public String getNonDirectionalTag() { - return null; - } - public int onewayDirection(){ if(type == ONEWAY){ return intValue; diff --git a/OsmAnd-java/src/main/java/net/osmand/router/RoutingConfiguration.java b/OsmAnd-java/src/main/java/net/osmand/router/RoutingConfiguration.java index 09a1003483..232b971f9f 100644 --- a/OsmAnd-java/src/main/java/net/osmand/router/RoutingConfiguration.java +++ b/OsmAnd-java/src/main/java/net/osmand/router/RoutingConfiguration.java @@ -47,7 +47,7 @@ public class RoutingConfiguration { public float recalculateDistance = 20000f; // 1.6 Time to calculate all access restrictions based on conditions - public long routeCalculationTime = 1592317409;//0; + public long routeCalculationTime = 0; public static class Builder { // Design time storage diff --git a/OsmAnd-java/src/main/java/net/osmand/router/RoutingContext.java b/OsmAnd-java/src/main/java/net/osmand/router/RoutingContext.java index ed6f451763..2c44940dff 100644 --- a/OsmAnd-java/src/main/java/net/osmand/router/RoutingContext.java +++ b/OsmAnd-java/src/main/java/net/osmand/router/RoutingContext.java @@ -17,7 +17,6 @@ import org.apache.commons.logging.Log; import gnu.trove.iterator.TIntObjectIterator; import gnu.trove.iterator.TLongIterator; import gnu.trove.map.TLongObjectMap; -import gnu.trove.map.hash.TIntObjectHashMap; import gnu.trove.map.hash.TLongObjectHashMap; import gnu.trove.set.hash.TLongHashSet; import net.osmand.NativeLibrary; @@ -608,8 +607,6 @@ public class RoutingContext { public TLongObjectMap getRoutes() { return routes; } - private TIntObjectHashMap forwardTags; - private TIntObjectHashMap backwardTags; public void loadAllObjects(final List toFillIn, RoutingContext ctx, TLongObjectHashMap excludeDuplications) { if(routes != null) {