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

Update rendering additional

Browse source
This commit is contained in:
Victor Shcherb 2015-01-08 01:15:47 +01:00
parent e29b1ed6a7
commit 356773d6ff
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
OsmAnd-java/src/net/osmand/render/RenderingRuleProperty.java
View file

@ -3,6 +3,7 @@ package net.osmand.render;
import net.osmand.PlatformUtil;
import net.osmand.binary.BinaryMapDataObject;
import net.osmand.binary.BinaryMapIndexReader.TagValuePair;
import org.apache.commons.logging.Log;
@ -283,16 +284,27 @@ public class RenderingRuleProperty {
return val != null && val.equals(val2);
}
int i = val.indexOf('=');
if (i != -1) {
String ts = val.substring(0, i);
String vs = val.substring(i + 1);
int k = val.indexOf('=');
if (k != -1) {
String ts = val.substring(0, k);
String vs = val.substring(k + 1);
Integer ruleInd = req.getObject().getMapIndex().getRule(ts, vs);
if (ruleInd != null) {
if (req.getObject().containsAdditionalType(ruleInd)) {
return true;
}
}
} else {
String ts = val.substring(0, k);
if (ts != null) {
int[] additionalTypes = obj.getAdditionalTypes();
for (int i = 0; i < additionalTypes.length; i++) {
TagValuePair vp = obj.getMapIndex().decodeType(additionalTypes[i]);
if (vp != null && ts.equals(vp.tag)) {
return true;
}
}
}
}
return false;
}