implement hierarchy for xml renderers
git-svn-id: https://osmand.googlecode.com/svn/trunk@686 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8
This commit is contained in:
parent
1308afa227
commit
b0a984cc91
1 changed files with 85 additions and 29 deletions
|
@ -25,6 +25,7 @@ public class BaseOsmandRender implements RenderingRuleVisitor {
|
||||||
|
|
||||||
public String name = "default"; //$NON-NLS-1$
|
public String name = "default"; //$NON-NLS-1$
|
||||||
public List<String> depends = new ArrayList<String>();
|
public List<String> depends = new ArrayList<String>();
|
||||||
|
public List<BaseOsmandRender> dependRenderers = new ArrayList<BaseOsmandRender>();
|
||||||
private static final Log log = LogUtil.getLog(BaseOsmandRender.class);
|
private static final Log log = LogUtil.getLog(BaseOsmandRender.class);
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
|
@ -84,10 +85,18 @@ public class BaseOsmandRender implements RenderingRuleVisitor {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public Integer getPointIcon(String tag, String val, int zoom){
|
public Integer getPointIcon(String tag, String val, int zoom) {
|
||||||
Integer i = getPointIconImpl(tag,val, zoom);
|
Integer i = getPointIconImpl(tag, val, zoom);
|
||||||
if(i== null){
|
if (i == null) {
|
||||||
return getPointIconImpl(tag, null, zoom);
|
i = getPointIconImpl(tag, null, zoom);
|
||||||
|
}
|
||||||
|
if (i == null) {
|
||||||
|
for (BaseOsmandRender d : dependRenderers) {
|
||||||
|
i = d.getPointIcon(tag, val, zoom);
|
||||||
|
if (i != null) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
@ -105,6 +114,15 @@ public class BaseOsmandRender implements RenderingRuleVisitor {
|
||||||
if (f == 0) {
|
if (f == 0) {
|
||||||
f = getObjectOrderImpl("", null, type, layer); //$NON-NLS-1$
|
f = getObjectOrderImpl("", null, type, layer); //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
|
if(f == 0){
|
||||||
|
for(BaseOsmandRender d : dependRenderers){
|
||||||
|
f = d.getObjectOrder(tag, val, type, layer);
|
||||||
|
if (f != 0) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (f == 0) {
|
if (f == 0) {
|
||||||
if (type == 0 || type == 3) {
|
if (type == 0 || type == 3) {
|
||||||
return 1f;
|
return 1f;
|
||||||
|
@ -116,6 +134,60 @@ public class BaseOsmandRender implements RenderingRuleVisitor {
|
||||||
}
|
}
|
||||||
return f;
|
return f;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean renderPolyline(String tag, String val, int zoom, RenderingContext rc, OsmandRenderer o, int layer){
|
||||||
|
boolean r = renderPolylineImpl(tag,val, zoom, rc, o, layer);
|
||||||
|
if(!r){
|
||||||
|
r = renderPolylineImpl(tag, null, zoom, rc, o, layer);
|
||||||
|
}
|
||||||
|
if(!r){
|
||||||
|
for(BaseOsmandRender d : dependRenderers){
|
||||||
|
r = d.renderPolyline(tag, val, zoom, rc, o, layer);
|
||||||
|
if (r) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
public boolean renderPolygon(String tag, String val, int zoom, RenderingContext rc, OsmandRenderer o){
|
||||||
|
boolean r = renderPolygonImpl(tag,val, zoom, rc, o);
|
||||||
|
if(!r){
|
||||||
|
r = renderPolygonImpl(tag, null, zoom, rc, o);
|
||||||
|
}
|
||||||
|
if(!r){
|
||||||
|
for(BaseOsmandRender d : dependRenderers){
|
||||||
|
r = d.renderPolygon(tag, val, zoom, rc, o);
|
||||||
|
if (r) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String renderObjectText(String name, String tag, String val, RenderingContext rc, boolean ref) {
|
||||||
|
if(name == null || name.length() == 0){
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
String ret = renderObjectTextImpl(name, tag, val, rc, ref);
|
||||||
|
if(rc.textSize == 0){
|
||||||
|
ret = renderObjectTextImpl(name, tag, null, rc, ref);
|
||||||
|
}
|
||||||
|
if(rc.textSize == 0){
|
||||||
|
for(BaseOsmandRender d : dependRenderers){
|
||||||
|
ret = d.renderObjectText(name, tag, val, rc, ref);
|
||||||
|
if (rc.textSize > 0) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(rc.textSize > 0){
|
||||||
|
return ret;
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private float getObjectOrderImpl(String tag, String val, int type, int layer) {
|
private float getObjectOrderImpl(String tag, String val, int type, int layer) {
|
||||||
Map<String, List<FilterState>> map = rules[OsmandRenderingRulesParser.ORDER_STATE].get(tag);
|
Map<String, List<FilterState>> map = rules[OsmandRenderingRulesParser.ORDER_STATE].get(tag);
|
||||||
|
@ -147,14 +219,6 @@ public class BaseOsmandRender implements RenderingRuleVisitor {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean renderPolyline(String tag, String val, int zoom, RenderingContext rc, OsmandRenderer o, int layer){
|
|
||||||
boolean r = renderPolylineImpl(tag,val, zoom, rc, o, layer);
|
|
||||||
if(!r){
|
|
||||||
return renderPolylineImpl(tag, null, zoom, rc, o, layer);
|
|
||||||
}
|
|
||||||
return r;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean renderPolylineImpl(String tag, String val, int zoom, RenderingContext rc, OsmandRenderer o, int layer) {
|
private boolean renderPolylineImpl(String tag, String val, int zoom, RenderingContext rc, OsmandRenderer o, int layer) {
|
||||||
Map<String, List<FilterState>> map = rules[OsmandRenderingRulesParser.LINE_STATE].get(tag);
|
Map<String, List<FilterState>> map = rules[OsmandRenderingRulesParser.LINE_STATE].get(tag);
|
||||||
if (map != null) {
|
if (map != null) {
|
||||||
|
@ -199,13 +263,7 @@ public class BaseOsmandRender implements RenderingRuleVisitor {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean renderPolygon(String tag, String val, int zoom, RenderingContext rc, OsmandRenderer o){
|
|
||||||
boolean r = renderPolygonImpl(tag,val, zoom, rc, o);
|
|
||||||
if(!r){
|
|
||||||
return renderPolygonImpl(tag, null, zoom, rc, o);
|
|
||||||
}
|
|
||||||
return r;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean renderPolygonImpl(String tag, String val, int zoom, RenderingContext rc, OsmandRenderer o) {
|
private boolean renderPolygonImpl(String tag, String val, int zoom, RenderingContext rc, OsmandRenderer o) {
|
||||||
Map<String, List<FilterState>> map = rules[OsmandRenderingRulesParser.POLYGON_STATE].get(tag);
|
Map<String, List<FilterState>> map = rules[OsmandRenderingRulesParser.POLYGON_STATE].get(tag);
|
||||||
|
@ -258,16 +316,6 @@ public class BaseOsmandRender implements RenderingRuleVisitor {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public String renderObjectText(String name, String tag, String val, RenderingContext rc, boolean ref) {
|
|
||||||
if(name == null || name.length() == 0){
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
String ret = renderObjectTextImpl(name, tag, val, rc, ref);
|
|
||||||
if(rc.textSize > 0){
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
return renderObjectTextImpl(name, tag, null, rc, ref);
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean checkRefTextRule(FilterState f, boolean ref){
|
private boolean checkRefTextRule(FilterState f, boolean ref){
|
||||||
if(ref){
|
if(ref){
|
||||||
|
@ -318,4 +366,12 @@ public class BaseOsmandRender implements RenderingRuleVisitor {
|
||||||
rc.textBold = f.text.textBold;
|
rc.textBold = f.text.textBold;
|
||||||
rc.textDy = f.text.textDy;
|
rc.textDy = f.text.textDy;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<String> getDepends() {
|
||||||
|
return depends;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDependRenderers(List<BaseOsmandRender> dependRenderers) {
|
||||||
|
this.dependRenderers = dependRenderers;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue