Merge pull request #45 from sonora/master

implement moreDetail switch (3)
This commit is contained in:
sonora 2011-08-25 03:06:39 -07:00
commit 8c94b86d0c

View file

@ -713,7 +713,7 @@ public class OsmandRenderer {
rc.second.emptyLine();
rc.main.color = Color.rgb(245, 245, 245);
boolean rendered = render.renderPolygon(tag, value, rc.zoom, rc, this, rc.nightMode);
boolean rendered = render.renderPolygon(tag, value, rc.zoom, rc, this, rc.nightMode, rc.moreDetail);
if(!rendered){
return;
}
@ -766,7 +766,7 @@ public class OsmandRenderer {
rc.second.emptyLine();
// rc.main.color = Color.rgb(245, 245, 245);
boolean rendered = render.renderPolygon(pair.tag, pair.value, zoom, rc, this, rc.nightMode);
boolean rendered = render.renderPolygon(pair.tag, pair.value, zoom, rc, this, rc.nightMode, rc.moreDetail);
if(!rendered){
return;
}
@ -820,13 +820,13 @@ public class OsmandRenderer {
if (ref != null && ref.trim().length() > 0) {
rc.clearText();
ref = render.renderObjectText(ref, pair.tag, pair.value, rc, true, rc.nightMode);
ref = render.renderObjectText(ref, pair.tag, pair.value, rc, true, rc.nightMode, rc.moreDetail);
TextDrawInfo text = new TextDrawInfo(ref);
text.fillProperties(rc, xText, yText);
rc.textToDraw.add(text);
}
name = render.renderObjectText(name, pair.tag, pair.value, rc, false, rc.nightMode);
name = render.renderObjectText(name, pair.tag, pair.value, rc, false, rc.nightMode, rc.moreDetail);
if (rc.textSize > 0 && name != null) {
TextDrawInfo info = new TextDrawInfo(name);
info.fillProperties(rc, xText, yText);
@ -840,7 +840,7 @@ public class OsmandRenderer {
return;
}
Integer resId = render.getPointIcon(pair.tag, pair.value, rc.zoom, rc.nightMode);
Integer resId = render.getPointIcon(pair.tag, pair.value, rc.zoom, rc.nightMode, rc.moreDetail);
String name = null;
if (renderText) {
name = obj.getName();
@ -888,7 +888,7 @@ public class OsmandRenderer {
rc.second.emptyLine();
rc.third.emptyLine();
rc.adds = null;
boolean res = render.renderPolyline(pair.tag, pair.value, rc.zoom, rc, this, layer, rc.nightMode);
boolean res = render.renderPolyline(pair.tag, pair.value, rc.zoom, rc, this, layer, rc.nightMode, rc.moreDetail);
if(rc.main.strokeWidth == 0 || !res){
return;
}
@ -973,7 +973,7 @@ public class OsmandRenderer {
}
if(ref != null && ref.trim().length() > 0){
rc.clearText();
ref = render.renderObjectText(ref, pair.tag, pair.value, rc, true, rc.nightMode);
ref = render.renderObjectText(ref, pair.tag, pair.value, rc, true, rc.nightMode, rc.moreDetail);
TextDrawInfo text = new TextDrawInfo(ref);
text.fillProperties(rc, middlePoint.x, middlePoint.y);
text.pathRotate = pathRotate;
@ -983,7 +983,7 @@ public class OsmandRenderer {
if(name != null && name.trim().length() > 0){
rc.clearText();
name = render.renderObjectText(name, pair.tag, pair.value, rc, false, rc.nightMode);
name = render.renderObjectText(name, pair.tag, pair.value, rc, false, rc.nightMode, rc.moreDetail);
if (rc.textSize > 0) {
TextDrawInfo text = new TextDrawInfo(name);
if (!rc.showTextOnPath) {