Ticket #22695: text-rotation.1.patch

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

@@ -620 +620 @@
         FontRenderContext frc = g.getFontRenderContext();
         Rectangle2D bounds = text.font.getStringBounds(s, frc);
 
-        double x = p.getInViewX() + bs.xOffset;
-        double y = p.getInViewY() + bs.yOffset;
+        double x = bs.xOffset;
+        double y = bs.yOffset;
         /**
          *
          *       left-above __center-above___ right-above
@@ -660 +660 @@
             } else throw new AssertionError();
         }
 
-        final MapViewPoint viewPoint = mapState.getForView(x, y);
+        final MapViewPoint viewPoint = mapState.getForView(p.getInViewX(), p.getInViewY());
         final AffineTransform at = new AffineTransform();
         at.setToTranslation(
                 Math.round(viewPoint.getInViewX()),
@@ -668 +668 @@
         if (!RotationAngle.NO_ROTATION.equals(text.rotationAngle)) {
             at.rotate(text.rotationAngle.getRotationAngle(n));
         }
+        at.translate(x, y);
         displayText(n, text, s, at);
         g.setFont(defaultFont);
     }