Changeset 12455 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor

Timestamp:

2017-07-07T21:27:45+02:00 (7 years ago)

Author:

michael2402

Message:

Fix #14926: Preserve image phase when clamping a line.

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (modified) (4 diffs)

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

@@ -655 +655 @@
         }
 
-        double startOffset = phase % repeat;
-        if (startOffset < 0) {
-            startOffset += repeat;
-        }
+        double startOffset = computeStartOffset(phase, repeat);
 
         BufferedImage image = pattern.getImage(disabled);
 
-        path.visitClippedLine(startOffset, repeat, (inLineOffset, start, end, startIsOldEnd) -> {
+        path.visitClippedLine(repeat, (inLineOffset, start, end, startIsOldEnd) -> {
             final double segmentLength = start.distanceToInView(end);
             if (segmentLength < 0.1) {
@@ -679 +676 @@
 
             // The start of the next image
-            double imageStart = -(inLineOffset % repeat);
+            double imageStart = -((inLineOffset + startOffset) % repeat);
 
             while (imageStart < segmentLength) {
@@ -691 +688 @@
             g.setTransform(saveTransform);
         });
+    }
+
+    private static double computeStartOffset(double phase, final double repeat) {
+        double startOffset = phase % repeat;
+        if (startOffset < 0) {
+            startOffset += repeat;
+        }
+        return startOffset;
     }
 
@@ -1291 +1296 @@
             double interval = 60;
 
-            path.visitClippedLine(0, 60, (inLineOffset, start, end, startIsOldEnd) -> {
+            path.visitClippedLine(60, (inLineOffset, start, end, startIsOldEnd) -> {
                 double segmentLength = start.distanceToInView(end);
                 if (segmentLength > 0.001) {