Changeset 12477 in josm for trunk

Timestamp:

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

Author:

michael2402

Message:

See #15006: Fix sign issue (wrong direction) for text-offset-y on ways/areas

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/CompletelyInsideAreaStrategy.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/OnLineStrategy.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/PartiallyInsideAreaStrategy.java (modified) (1 diff)
• test/data/renderer/area-text/reference.png (modified) ( previous)
• test/data/renderer/area-text/style.mapcss (modified) (1 diff)
• test/data/renderer/way-text/reference.png (modified) ( previous)

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

@@ -111 +111 @@
             return this;
         } else {
-            return new CompletelyInsideAreaStrategy(offsetX + addToOffset.getX(), offsetY + addToOffset.getY());
+            return new CompletelyInsideAreaStrategy(offsetX + addToOffset.getX(), offsetY - addToOffset.getY());
         }
     }
@@ -145 +145 @@
         CompletelyInsideAreaStrategy other = (CompletelyInsideAreaStrategy) obj;
         return Double.doubleToLongBits(offsetX) == Double.doubleToLongBits(other.offsetX)
-                && Double.doubleToLongBits(offsetY) != Double.doubleToLongBits(other.offsetY);
+                && Double.doubleToLongBits(offsetY) == Double.doubleToLongBits(other.offsetY);
     }
 }

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

@@ -339 +339 @@
             return this;
         } else {
-            return new OnLineStrategy(addToOffset.getY() + this.yOffset);
+            return new OnLineStrategy(this.yOffset - addToOffset.getY());
         }
     }

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

@@ -52 +52 @@
             return this;
         } else {
-            return new PartiallyInsideAreaStrategy(offsetX + addToOffset.getX(), offsetY + addToOffset.getY());
+            return new PartiallyInsideAreaStrategy(offsetX + addToOffset.getX(), offsetY - addToOffset.getY());
         }
     }

trunk/test/data/renderer/area-text/style.mapcss

@@ -13 +13 @@
 }
 
+area[test=C] {
+        text-offset-x: 5;
+        text-offset-y: -10.5;
+}
+
+area[test=D] {
+        text-offset: list(10.2, 20.5);
+}
+
 area[test=H] {
         text: eval("");