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

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.mappaint.styleelement.placement;
 
+import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 
@@ -20 +21 @@
      * An instance of this class.
      */
-    public static final PartiallyInsideAreaStrategy INSTANCE = new PartiallyInsideAreaStrategy();
+    public static final PartiallyInsideAreaStrategy INSTANCE = new PartiallyInsideAreaStrategy(0, 0);
 
-    private PartiallyInsideAreaStrategy() {
+    private PartiallyInsideAreaStrategy(double offsetX, double offsetY) {
+        super(offsetX, offsetY);
     }
 
@@ -44 +46 @@
         }
     }
+
+    @Override
+    public PositionForAreaStrategy withAddedOffset(Point2D addToOffset) {
+        if (Math.abs(addToOffset.getX()) < 1e-5 && Math.abs(addToOffset.getY()) < 1e-5) {
+            return this;
+        } else {
+            return new PartiallyInsideAreaStrategy(offsetX + addToOffset.getX(), offsetY + addToOffset.getY());
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "PartiallyInsideAreaStrategy [offsetX=" + offsetX + ", offsetY=" + offsetY + "]";
+    }
 }