Changeset 12476 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/OnLineStrategy.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/placement/OnLineStrategy.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/OnLineStrategy.java

@@ -4 +4 @@
 import java.awt.font.GlyphVector;
 import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
@@ -332 +333 @@
         return Math.atan2(end.getInViewY() - start.getInViewY(), end.getInViewX() - start.getInViewX());
     }
+
+    @Override
+    public PositionForAreaStrategy withAddedOffset(Point2D addToOffset) {
+        if (Math.abs(addToOffset.getY()) < 1e-5) {
+            return this;
+        } else {
+            return new OnLineStrategy(addToOffset.getY() + this.yOffset);
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "OnLineStrategy [yOffset=" + yOffset + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        long temp;
+        temp = Double.doubleToLongBits(yOffset);
+        result = prime * result + (int) (temp ^ (temp >>> 32));
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        OnLineStrategy other = (OnLineStrategy) obj;
+        if (Double.doubleToLongBits(yOffset) != Double.doubleToLongBits(other.yOffset)) {
+            return false;
+        }
+        return true;
+    }
 }