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

Merge remote-tracking branch 'origin/master' into configure_menu_items

Browse source
This commit is contained in:
veliymolfar 2020-04-01 11:25:33 +03:00
commit 8450787f77
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -173,7 +173,7 @@ public class RouteSegmentResult implements StringExternalizable<RouteDataBundle>
return res; return res;
} }
private int[][] convertPointNames(int[][] nameTypes, Map<RouteTypeRule, Integer> rules) { private int[][] convertPointNames(int[][] nameTypes, String[][] pointNames, Map<RouteTypeRule, Integer> rules) {
if (nameTypes == null || nameTypes.length == 0) { if (nameTypes == null || nameTypes.length == 0) {
return null; return null;
} }
@ -185,7 +185,7 @@ public class RouteSegmentResult implements StringExternalizable<RouteDataBundle>
for (int k = 0; k < types.length; k++) { for (int k = 0; k < types.length; k++) {
int type = types[k]; int type = types[k];
String tag = object.region.quickGetEncodingRule(type).getTag(); String tag = object.region.quickGetEncodingRule(type).getTag();
String name = object.pointNames[i][k]; String name = pointNames[i][k];
RouteTypeRule rule = new RouteTypeRule(tag, name); RouteTypeRule rule = new RouteTypeRule(tag, name);
Integer ruleId = rules.get(rule); Integer ruleId = rules.get(rule);
if (ruleId == null) { if (ruleId == null) {
@ -281,7 +281,8 @@ public class RouteSegmentResult implements StringExternalizable<RouteDataBundle>
if (object.pointNameTypes != null && start < object.pointNameTypes.length) { if (object.pointNameTypes != null && start < object.pointNameTypes.length) {
int[][] types = Arrays.copyOfRange(object.pointNameTypes, start, Math.min(end, object.pointNameTypes.length)); int[][] types = Arrays.copyOfRange(object.pointNameTypes, start, Math.min(end, object.pointNameTypes.length));
if (object.pointNames != null) { if (object.pointNames != null) {
bundle.putArray("pointNames", convertPointNames(types, rules)); String[][] names = Arrays.copyOfRange(object.pointNames, start, Math.min(end, object.pointNames.length));
bundle.putArray("pointNames", convertPointNames(types, names, rules));
} }
} }
} }