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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2014-09-14 10:31:34 +02:00
commit 60b66b97e9
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
OsmAnd-java/src/net/osmand/render/RenderingRuleSearchRequest.java
View file

@ -162,7 +162,7 @@ public class RenderingRuleSearchRequest {
}
// accept it
if(!rule.isGroup()) {
loadOutputProperties(rule);
loadOutputProperties(rule, true);
}
boolean match = false;
for (RenderingRule rr : rule.getIfElseChildren()) {
@ -173,7 +173,7 @@ public class RenderingRuleSearchRequest {
}
if (match || !rule.isGroup()) {
if (rule.isGroup()) {
loadOutputProperties(rule);
loadOutputProperties(rule, false);
}
for (RenderingRule rr : rule.getIfChildren()) {
@ -185,17 +185,18 @@ public class RenderingRuleSearchRequest {
}
protected void loadOutputProperties(RenderingRule rule) {
protected void loadOutputProperties(RenderingRule rule, boolean override) {
RenderingRuleProperty[] properties = rule.getProperties();
for (int i = 0; i < properties.length; i++) {
RenderingRuleProperty rp = properties[i];
if (rp.isOutputProperty()) {
searchResult = true;
if (rp.isFloat()) {
fvalues[rp.getId()] = rule.getFloatProp(i);
values[rp.getId()] = rule.getIntProp(i);
} else {
values[rp.getId()] = rule.getIntProp(i);
if (!isSpecified(rp) || override) {
if (rp.isFloat()) {
fvalues[rp.getId()] = rule.getFloatProp(i);
values[rp.getId()] = rule.getIntProp(i);
} else {
values[rp.getId()] = rule.getIntProp(i);
}
}
}
}