rename theme style classes

This commit is contained in:
Hannes Janetzek
2014-03-17 22:48:20 +01:00
parent 4e473bf242
commit 46b2eb2a3e
28 changed files with 178 additions and 178 deletions

View File

@@ -19,8 +19,8 @@ import org.oscim.core.MapElement;
import org.oscim.core.Tag;
import org.oscim.core.TagSet;
import org.oscim.theme.IRenderTheme;
import org.oscim.theme.styles.Area;
import org.oscim.theme.styles.Line;
import org.oscim.theme.styles.AreaStyle;
import org.oscim.theme.styles.LineStyle;
import org.oscim.theme.styles.RenderStyle;
public class RenderTheme implements IRenderTheme {
@@ -147,11 +147,11 @@ public class RenderTheme implements IRenderTheme {
}
if (p != null) {
s.ri[0] = new Area(mCurLevel++, color(p));
s.ri[0] = new AreaStyle(mCurLevel++, color(p));
}
if (l != null) {
s.ri[1] = new Line(mCurLevel++, color(l), 1);
s.ri[1] = new LineStyle(mCurLevel++, color(l), 1);
}
if (p != null || l != null) {
@@ -198,7 +198,7 @@ public class RenderTheme implements IRenderTheme {
RGB c = r.color(f, CartoCSS.POLYGON_FILL, RGB.black);
out.println(z + " " + c);
return new RenderStyle[] {
new Area(z, color(c))
new AreaStyle(z, color(c))
};
} else if (type == GeometryType.LINE) {
@@ -207,7 +207,7 @@ public class RenderTheme implements IRenderTheme {
//out.println(z + " " + c);
return new RenderStyle[] {
new Line(100 + z, color(c), width)
new LineStyle(100 + z, color(c), width)
};
} else if (type == GeometryType.POINT) {