Changeset 12476 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java

Timestamp:

2017-07-13T23:02:13+02:00 (7 years ago)

Author:

michael2402

Message:

Fix #15006: Separate offset handling for ways, areas and node. Handle offset for all three of them.

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java (modified) (12 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java

@@ -4 +4 @@
 import java.awt.Color;
 import java.awt.Font;
+import java.awt.geom.Point2D;
 import java.util.Objects;
 
@@ -15 +16 @@
 import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy.StaticLabelCompositionStrategy;
 import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy.TagLookupCompositionStrategy;
-import org.openstreetmap.josm.gui.mappaint.styleelement.placement.PositionForAreaStrategy;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Utils;
@@ -39 +39 @@
     public Font font;
     /**
-     * The x offset of the text.
-     */
-    public int xOffset;
-    /**
-     * The y offset of the text.
-     */
-    public int yOffset;
-    /**
      * The color to draw the text in, includes alpha.
      */
@@ -58 +50 @@
      */
     public Color haloColor;
-
-    /**
-     * The position strategy for this text label.
-     */
-    private final PositionForAreaStrategy labelPositionStrategy;
 
     /**
@@ -70 +57 @@
      * If null, no label is rendered.
      * @param font the font to be used. Must not be null.
-     * @param xOffset x offset
-     * @param yOffset y offset
      * @param color the color to be used. Must not be null
      * @param haloRadius halo radius
      * @param haloColor halo color
-     * @param labelPositionStrategy The position in the area.
-     */
-    protected TextLabel(LabelCompositionStrategy strategy, Font font, int xOffset, int yOffset, Color color, Float haloRadius,
-            Color haloColor, PositionForAreaStrategy labelPositionStrategy) {
+     */
+    protected TextLabel(LabelCompositionStrategy strategy, Font font, Color color, Float haloRadius,
+            Color haloColor) {
         this.labelCompositionStrategy = strategy;
         this.font = Objects.requireNonNull(font, "font");
-        this.xOffset = xOffset;
-        this.yOffset = yOffset;
         this.color = Objects.requireNonNull(color, "color");
         this.haloRadius = haloRadius;
         this.haloColor = haloColor;
-        this.labelPositionStrategy = Objects.requireNonNull(labelPositionStrategy, "labelPositionStrategy");
     }
 
@@ -97 +78 @@
         this.labelCompositionStrategy = other.labelCompositionStrategy;
         this.font = other.font;
-        this.xOffset = other.xOffset;
-        this.yOffset = other.yOffset;
         this.color = other.color;
         this.haloColor = other.haloColor;
         this.haloRadius = other.haloRadius;
-        this.labelPositionStrategy = other.labelPositionStrategy;
-    }
-
-    /**
-     * Copy constructor that changes the position strategy.
-     *
-     * @param other the other element.
-     * @param labelPositionStrategy the position
-     */
-    private TextLabel(TextLabel other, PositionForAreaStrategy labelPositionStrategy) {
-        this.labelCompositionStrategy = other.labelCompositionStrategy;
-        this.font = other.font;
-        this.xOffset = other.xOffset;
-        this.yOffset = other.yOffset;
-        this.color = other.color;
-        this.haloColor = other.haloColor;
-        this.haloRadius = other.haloRadius;
-        this.labelPositionStrategy = labelPositionStrategy;
     }
 
@@ -176 +137 @@
         Font font = StyleElement.getFont(c, s);
 
+        Color color = c.get(TEXT_COLOR, defaultTextColor, Color.class);
+        float alpha = c.get(TEXT_OPACITY, 1f, Float.class);
+        color = Utils.alphaMultiply(color, alpha);
+
+        Float haloRadius = c.get(TEXT_HALO_RADIUS, null, Float.class);
+        if (haloRadius != null && haloRadius <= 0) {
+            haloRadius = null;
+        }
+        Color haloColor = null;
+        if (haloRadius != null) {
+            haloColor = c.get(TEXT_HALO_COLOR, Utils.complement(color), Color.class);
+            float haloAlphaFactor = c.get(TEXT_HALO_OPACITY, 1f, Float.class);
+            haloColor = Utils.alphaMultiply(haloColor, haloAlphaFactor);
+        }
+
+        return new TextLabel(strategy, font, color, haloRadius, haloColor);
+    }
+
+    /**
+     * Gets the text-offset property from a cascade
+     * @param c The cascade
+     * @return The text offset property
+     */
+    public static Point2D getTextOffset(Cascade c) {
         float xOffset = 0;
         float yOffset = 0;
@@ -189 +174 @@
         xOffset = c.get(TEXT_OFFSET_X, xOffset, Float.class);
         yOffset = c.get(TEXT_OFFSET_Y, yOffset, Float.class);
-
-        Color color = c.get(TEXT_COLOR, defaultTextColor, Color.class);
-        float alpha = c.get(TEXT_OPACITY, 1f, Float.class);
-        color = Utils.alphaMultiply(color, alpha);
-
-        Float haloRadius = c.get(TEXT_HALO_RADIUS, null, Float.class);
-        if (haloRadius != null && haloRadius <= 0) {
-            haloRadius = null;
-        }
-        Color haloColor = null;
-        if (haloRadius != null) {
-            haloColor = c.get(TEXT_HALO_COLOR, Utils.complement(color), Color.class);
-            float haloAlphaFactor = c.get(TEXT_HALO_OPACITY, 1f, Float.class);
-            haloColor = Utils.alphaMultiply(haloColor, haloAlphaFactor);
-        }
-
-        Keyword positionKeyword = c.get(AreaElement.TEXT_POSITION, null, Keyword.class);
-        PositionForAreaStrategy position = PositionForAreaStrategy.forKeyword(positionKeyword);
-
-        return new TextLabel(strategy, font, (int) xOffset, -(int) yOffset, color, haloRadius, haloColor, position);
+        return new Point2D.Double(xOffset, yOffset);
     }
 
@@ -223 +189 @@
     }
 
-    /**
-     * Gets the strategy that defines where to place the label.
-     * @return The strategy. Never null.
-     * @since 11722
-     */
-    public PositionForAreaStrategy getLabelPositionStrategy() {
-        return labelPositionStrategy;
-    }
-
-    /**
-     * Creates a new text label with a different position strategy
-     * @param labelPositionStrategy The new position strategy to use
-     * @return The new label
-     */
-    public TextLabel withPosition(PositionForAreaStrategy labelPositionStrategy) {
-        return new TextLabel(this, labelPositionStrategy);
-    }
-
     @Override
     public String toString() {
@@ -249 +197 @@
         StringBuilder sb = new StringBuilder(96);
         sb.append("labelCompositionStrategy=").append(labelCompositionStrategy)
-          .append(" font=").append(font);
-        if (xOffset != 0) {
-            sb.append(" xOffset=").append(xOffset);
-        }
-        if (yOffset != 0) {
-            sb.append(" yOffset=").append(yOffset);
-        }
-        sb.append(" color=").append(Utils.toString(color));
+          .append(" font=").append(font)
+          .append(" color=").append(Utils.toString(color));
         if (haloRadius != null) {
             sb.append(" haloRadius=").append(haloRadius)
@@ -266 +208 @@
     @Override
     public int hashCode() {
-        return Objects.hash(labelCompositionStrategy, font, xOffset, yOffset, color, haloRadius, haloColor);
+        return Objects.hash(labelCompositionStrategy, font, color, haloRadius, haloColor);
     }
 
@@ -274 +216 @@
         if (obj == null || getClass() != obj.getClass()) return false;
         TextLabel textLabel = (TextLabel) obj;
-        return xOffset == textLabel.xOffset &&
-                yOffset == textLabel.yOffset &&
-                Objects.equals(labelCompositionStrategy, textLabel.labelCompositionStrategy) &&
+        return Objects.equals(labelCompositionStrategy, textLabel.labelCompositionStrategy) &&
                 Objects.equals(font, textLabel.font) &&
                 Objects.equals(color, textLabel.color) &&