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-12-17 11:14:31 +01:00
commit e2d0cf736a
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd-java/src/net/osmand/render/RenderingRuleStorageProperties.java
View file

@ -138,6 +138,7 @@ public class RenderingRuleStorageProperties {
public RenderingRuleProperty R_ICON_ORDER;
public RenderingRuleProperty R_TEXT_MIN_DISTANCE;
public RenderingRuleProperty R_TEXT_ON_PATH;
public RenderingRuleProperty R_ICON__1;
public RenderingRuleProperty R_ICON;
public RenderingRuleProperty R_ICON_2;
public RenderingRuleProperty R_ICON_3;
@ -231,6 +232,7 @@ public class RenderingRuleStorageProperties {
R_TEXT_ON_PATH = registerRuleInternal(RenderingRuleProperty.createOutputBooleanProperty(TEXT_ON_PATH));
// point
R_ICON__1 = registerRuleInternal(RenderingRuleProperty.createOutputStringProperty("icon__1"));
R_ICON = registerRuleInternal(RenderingRuleProperty.createOutputStringProperty(ICON));
R_ICON_2 = registerRuleInternal(RenderingRuleProperty.createOutputStringProperty("icon_2"));
R_ICON_3 = registerRuleInternal(RenderingRuleProperty.createOutputStringProperty("icon_3"));

4
OsmAnd/src/net/osmand/plus/render/OsmandRenderer.java
View file

@ -83,6 +83,7 @@ public class OsmandRenderer {
private static class IconDrawInfo {
float x = 0;
float y = 0;
String resId_1;
String resId;
String resId2;
String resId3;
@ -351,12 +352,14 @@ public class OsmandRenderer {
}
if (coeff != 1f) {
Rect src = new Rect(0, 0, ico.getWidth(), ico.getHeight());
drawBitmap(cv, RenderingIcons.getIcon(context, icon.resId_1), rf, src);
drawBitmap(cv, ico, rf, src);
drawBitmap(cv, RenderingIcons.getIcon(context, icon.resId2), rf, src);
drawBitmap(cv, RenderingIcons.getIcon(context, icon.resId3), rf, src);
drawBitmap(cv, RenderingIcons.getIcon(context, icon.resId4), rf, src);
drawBitmap(cv, RenderingIcons.getIcon(context, icon.resId5), rf, src);
} else {
drawBitmap(cv, RenderingIcons.getIcon(context, icon.resId_1), rf);
drawBitmap(cv, ico, rf);
drawBitmap(cv, RenderingIcons.getIcon(context, icon.resId2), rf);
drawBitmap(cv, RenderingIcons.getIcon(context, icon.resId3), rf);
@ -808,6 +811,7 @@ public class OsmandRenderer {
ico.iconOrder = render.getIntPropertyValue(render.ALL.R_ICON_ORDER, 100);
ico.iconSize = rc.getComplexValue(render, render.ALL.R_ICON_VISIBLE_SIZE, -1);
ico.shieldId = render.getStringPropertyValue(render.ALL.R_SHIELD);
ico.resId_1 = render.getStringPropertyValue(render.ALL.R_ICON__1);
ico.resId = resId;
ico.resId2 = render.getStringPropertyValue(render.ALL.R_ICON_2);
ico.resId3 = render.getStringPropertyValue(render.ALL.R_ICON_3);