From 4d78fc77de437d60eea2e7282dac39ed1a3827d6 Mon Sep 17 00:00:00 2001 From: Dima-1 Date: Thu, 25 Mar 2021 09:52:18 +0200 Subject: [PATCH 1/2] fix replace getNonConditionalTag --- .../src/main/java/net/osmand/binary/RouteDataObject.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java b/OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java index b6dc2f2176..5d0f842021 100644 --- a/OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java +++ b/OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java @@ -583,8 +583,8 @@ public class RouteDataObject { String nonCondTag = rtr.getTag(); int ks; for (ks = 0; ks < pointTypes[i].length; ks++) { - RouteTypeRule toReplace = region.quickGetEncodingRule(pointTypes[i][j]); - if (toReplace != null && toReplace.getTag().contentEquals(nonCondTag)) { + RouteTypeRule toReplace = region.quickGetEncodingRule(pointTypes[i][ks]); + if (toReplace != null && toReplace.getNonConditionalTag().contentEquals(nonCondTag)) { break; } } From 84ad07a7b5c732e7c070e1cce5749796fc600086 Mon Sep 17 00:00:00 2001 From: Dima-1 Date: Tue, 30 Mar 2021 14:27:15 +0300 Subject: [PATCH 2/2] return getTag --- .../src/main/java/net/osmand/binary/RouteDataObject.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java b/OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java index 5d0f842021..602a2f1682 100644 --- a/OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java +++ b/OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java @@ -584,7 +584,7 @@ public class RouteDataObject { int ks; for (ks = 0; ks < pointTypes[i].length; ks++) { RouteTypeRule toReplace = region.quickGetEncodingRule(pointTypes[i][ks]); - if (toReplace != null && toReplace.getNonConditionalTag().contentEquals(nonCondTag)) { + if (toReplace != null && toReplace.getTag().contentEquals(nonCondTag)) { break; } }