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

Fix problem with road shield

Browse source
This commit is contained in:
Victor Shcherb 2020-05-13 16:56:37 +02:00
parent 83d06a5efc
commit 7c204fde16
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
View file

@ -1138,16 +1138,23 @@ public class MapInfoWidgetsFactory {
for (int i = 0; i < object.nameIds.length; i++) { for (int i = 0; i < object.nameIds.length; i++) {
String key = object.region.routeEncodingRules.get(object.nameIds[i]).getTag(); String key = object.region.routeEncodingRules.get(object.nameIds[i]).getTag();
String val = object.names.get(object.nameIds[i]); String val = object.names.get(object.nameIds[i]);
if (key.startsWith("road_ref")) { if (!key.startsWith("road_ref")) {
nameTag = key;
name = val;
} else {
additional.append(key).append("=").append(val).append(";"); additional.append(key).append("=").append(val).append(";");
} }
} }
if(name == null || nameTag == null) { for (int i = 0; i < object.nameIds.length; i++) {
String key = object.region.routeEncodingRules.get(object.nameIds[i]).getTag();
String val = object.names.get(object.nameIds[i]);
if (key.startsWith("road_ref")) {
boolean visible = setRoadShield(view, object, key, val, additional);
if(visible) {
return true;
}
}
}
return false; return false;
} }
private boolean setRoadShield(ImageView view, RouteDataObject object, String nameTag, String name, StringBuilder additional ) {
Context context = topBar.getContext(); Context context = topBar.getContext();
int[] tps = object.getTypes(); int[] tps = object.getTypes();