diff --git a/vtm/src/org/oscim/theme/XmlThemeBuilder.java b/vtm/src/org/oscim/theme/XmlThemeBuilder.java index e0f1f946f..719bcfaef 100644 --- a/vtm/src/org/oscim/theme/XmlThemeBuilder.java +++ b/vtm/src/org/oscim/theme/XmlThemeBuilder.java @@ -331,7 +331,7 @@ else if (closed == Closed.NO) throw new ThemeException("zoom-min must be less or equal zoom-max: " + zoomMin); RuleBuilder b = RuleBuilder.create(keys, values); - b.setZoom(zoomMin, zoomMax); + b.zoom(zoomMin, zoomMax); b.element(element); b.select(selector); return b; diff --git a/vtm/src/org/oscim/theme/rule/RuleBuilder.java b/vtm/src/org/oscim/theme/rule/RuleBuilder.java index 101b7ade4..9c33dfebe 100644 --- a/vtm/src/org/oscim/theme/rule/RuleBuilder.java +++ b/vtm/src/org/oscim/theme/rule/RuleBuilder.java @@ -118,7 +118,7 @@ public static RuleBuilder create(String keys, String values) { return new RuleBuilder(type, keyList, valueList); } - public RuleBuilder setZoom(byte zoomMin, byte zoomMax) { + public RuleBuilder zoom(byte zoomMin, byte zoomMax) { // zoom-level bitmask zoom = 0; for (int z = zoomMin; z <= zoomMax && z < 32; z++) diff --git a/vtm/src/org/oscim/theme/styles/LineStyle.java b/vtm/src/org/oscim/theme/styles/LineStyle.java index cbb1d62ec..e29f7af32 100644 --- a/vtm/src/org/oscim/theme/styles/LineStyle.java +++ b/vtm/src/org/oscim/theme/styles/LineStyle.java @@ -110,7 +110,6 @@ public LineStyle current() { public static class LineBuilder> extends StyleBuilder { - public String style; public Cap cap; public boolean outline; public boolean fixed; @@ -165,11 +164,6 @@ public T reset() { return self(); } - public T style(String name) { - this.style = name; - return self(); - } - public T blur(float blur) { this.blur = blur; return self(); diff --git a/vtm/src/org/oscim/theme/styles/RenderStyle.java b/vtm/src/org/oscim/theme/styles/RenderStyle.java index e01ad12dd..1f174db7a 100644 --- a/vtm/src/org/oscim/theme/styles/RenderStyle.java +++ b/vtm/src/org/oscim/theme/styles/RenderStyle.java @@ -1,6 +1,7 @@ /* * Copyright 2010, 2011, 2012 mapsforge.org * Copyright 2013 Hannes Janetzek + * Copyright 2016 devemux86 * * This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * @@ -35,7 +36,7 @@ public static abstract class StyleBuilder> { public int strokeColor; public float strokeWidth; - public T setStyle(String style) { + public T style(String style) { this.style = style; return self(); }