diff --git a/vtm/src/org/oscim/theme/renderinstruction/Area.java b/vtm/src/org/oscim/theme/renderinstruction/Area.java index c174d06d..3ccc7f31 100644 --- a/vtm/src/org/oscim/theme/renderinstruction/Area.java +++ b/vtm/src/org/oscim/theme/renderinstruction/Area.java @@ -14,12 +14,7 @@ */ package org.oscim.theme.renderinstruction; -import org.oscim.backend.canvas.Color; import org.oscim.theme.IRenderCallback; -import org.oscim.theme.RenderThemeHandler; -import org.xml.sax.Attributes; - - /** * Represents a closed polygon on the map. @@ -28,7 +23,11 @@ public final class Area extends RenderInstruction { public Area(int fill) { - this.level = 0; + this(0, fill); + } + + public Area(int level, int fill) { + this.level = level; this.style = ""; this.fade = -1; blendColor = 0; @@ -53,8 +52,8 @@ public final class Area extends RenderInstruction { // paintFill.setShader(shader); // } - this.color = fill; //GlUtils.colorToFloatP(fill); - this.blendColor = blendFill; //GlUtils.colorToFloatP(blendFill); + this.color = fill; + this.blendColor = blendFill; this.blend = blend; this.strokeWidth = strokeWidth; diff --git a/vtm/src/org/oscim/theme/renderinstruction/Line.java b/vtm/src/org/oscim/theme/renderinstruction/Line.java index 29905a75..e5c8bd06 100644 --- a/vtm/src/org/oscim/theme/renderinstruction/Line.java +++ b/vtm/src/org/oscim/theme/renderinstruction/Line.java @@ -14,11 +14,8 @@ */ package org.oscim.theme.renderinstruction; -import org.oscim.backend.canvas.Color; import org.oscim.backend.canvas.Paint.Cap; import org.oscim.theme.IRenderCallback; -import org.oscim.theme.RenderThemeHandler; -import org.xml.sax.Attributes; /** * Represents a polyline on the map. @@ -94,6 +91,10 @@ public final class Line extends RenderInstruction { this(0, "", stroke, width, Cap.BUTT, true, 0, 0, 0, -1, 0, false, 0); } + public Line(int level, int stroke, float width) { + this(level, "", stroke, width, Cap.BUTT, true, 0, 0, 0, -1, 0, false, 0); + } + public Line(int stroke, float width, Cap cap) { this(0, "", stroke, width, cap, true, 0, 0, 0, -1, 0, false, 0); }