Changeset 12476 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.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/data/osm/visitor/paint/StyledMapRenderer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -582 +582 @@
         Rectangle2D bounds = text.font.getStringBounds(s, frc);
 
-        double x = Math.round(p.getInViewX()) + text.xOffset + bounds.getCenterX();
-        double y = Math.round(p.getInViewY()) + text.yOffset + bounds.getCenterY();
+        double x = Math.round(p.getInViewX()) + bs.xOffset + bounds.getCenterX();
+        double y = Math.round(p.getInViewY()) + bs.yOffset + bounds.getCenterY();
         /**
          *
@@ -1096 +1096 @@
      * Draws a text for the given primitive
      * @param osm The primitive to draw the text for
-     * @param text The text definition (font/position/.../text content) to draw.
+     * @param text The text definition (font/position/.../text content) to draw
+     * @param labelPositionStrategy The position of the text
      * @since 11722
      */
-    public void drawText(OsmPrimitive osm, TextLabel text) {
+    public void drawText(OsmPrimitive osm, TextLabel text, PositionForAreaStrategy labelPositionStrategy) {
         if (!isShowNames()) {
             return;
@@ -1114 +1115 @@
         forEachPolygon(osm, path -> {
             //TODO: Ignore areas that are out of bounds.
-            PositionForAreaStrategy position = text.getLabelPositionStrategy();
+            PositionForAreaStrategy position = labelPositionStrategy;
             MapViewPositionAndRotation center = position.findLabelPlacement(path, nb);
             if (center != null) {