From a560dff59d2c5c440f74b803ce85aab98f84ed73 Mon Sep 17 00:00:00 2001 From: madwasp79 Date: Tue, 21 May 2019 17:26:49 +0300 Subject: [PATCH] cleaning code 2 --- .../main/java/net/osmand/router/RoutingConfiguration.java | 7 ------- OsmAnd/src/net/osmand/plus/OsmandApplication.java | 6 +----- 2 files changed, 1 insertion(+), 12 deletions(-) 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 7a09b49922..36966231dc 100644 --- a/OsmAnd-java/src/main/java/net/osmand/router/RoutingConfiguration.java +++ b/OsmAnd-java/src/main/java/net/osmand/router/RoutingConfiguration.java @@ -63,13 +63,6 @@ public class RoutingConfiguration { // impassableRoadLocations.add(23000069L); // } - public void updateRouters(Builder update) { - defaultRouter = update.defaultRouter; - routers.putAll(update.routers); - attributes.putAll(update.attributes); - impassableRoadLocations.putAll(update.impassableRoadLocations); - } - public RoutingConfiguration build(String router, int memoryLimitMB) { return build(router, null, memoryLimitMB, null); } diff --git a/OsmAnd/src/net/osmand/plus/OsmandApplication.java b/OsmAnd/src/net/osmand/plus/OsmandApplication.java index 1779e36318..efe9e43b36 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandApplication.java +++ b/OsmAnd/src/net/osmand/plus/OsmandApplication.java @@ -815,11 +815,7 @@ public class OsmandApplication extends MultiDexApplication { } public void updateRoutingConfig(Builder update) { - if (routingConfig != null) { - final RoutingConfiguration.Builder b = routingConfig; - b.updateRouters(update); - routingConfig = b; - } + routingConfig = update; } public OsmandRegions getRegions() {