Changeset 12455 in josm for trunk

Timestamp:

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

Author:

michael2402

Message:

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

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/draw/MapViewPath.java (modified) (3 diffs)
• test/data/renderer/way-repeat-image-clamp (added)
• test/data/renderer/way-repeat-image-clamp/data.osm (added)
• test/data/renderer/way-repeat-image-clamp/reference.png (added)
• test/data/renderer/way-repeat-image-clamp/style.mapcss (added)
• test/data/renderer/way-repeat-image-clamp/trees.svg (added)
• test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java (modified) (1 diff)

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) {

trunk/src/org/openstreetmap/josm/gui/draw/MapViewPath.java

@@ -254 +254 @@
                 length += f;
             }
-            return visitClippedLine(((BasicStroke) stroke).getDashPhase(), length, consumer);
+            return visitClippedLine(length, consumer);
         } else {
-            return visitClippedLine(0, 0, consumer);
+            return visitClippedLine(0, consumer);
         }
     }
@@ -263 +263 @@
      * Visits all straight segments of this path. The segments are clamped to the view.
      * If they are clamped, the start points are aligned with the pattern.
-     * @param strokeOffset The initial offset of the pattern
-     * @param strokeLength The dash pattern length. 0 to use no pattern.
+     * @param strokeLength The dash pattern length. 0 to use no pattern. Only segments of this length will be removed from the line.
      * @param consumer The consumer to call for each segment
      * @return false if visiting the path failed because there e.g. were non-straight segments.
      * @since 11147
      */
-    public boolean visitClippedLine(double strokeOffset, double strokeLength, PathSegmentConsumer consumer) {
-        return new ClampingPathVisitor(state.getViewClipRectangle(), strokeOffset, strokeLength, consumer)
+    public boolean visitClippedLine(double strokeLength, PathSegmentConsumer consumer) {
+        return new ClampingPathVisitor(state.getViewClipRectangle(), strokeLength, consumer)
             .visit(this);
     }
@@ -400 +399 @@
          * Create a new {@link ClampingPathVisitor}
          * @param clip View clip rectangle
-         * @param strokeOffset Initial stroke offset
          * @param strokeLength Total length of a stroke sequence
          * @param consumer The consumer to notify of the path segments.
          */
-        ClampingPathVisitor(MapViewRectangle clip, double strokeOffset, double strokeLength, PathSegmentConsumer consumer) {
+        ClampingPathVisitor(MapViewRectangle clip, double strokeLength, PathSegmentConsumer consumer) {
             this.clip = clip;
-            this.strokeProgress = Math.min(strokeLength - strokeOffset, 0);
             this.strokeLength = strokeLength;
             this.consumer = consumer;

trunk/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java

@@ -111 +111 @@
 
                 /** Tests repeat-image feature for ways */
-                new TestConfig("way-repeat-image", AREA_DEFAULT)
+                new TestConfig("way-repeat-image", AREA_DEFAULT),
+                /** Tests the clamping for repeat-images and repeat-image-phase */
+                new TestConfig("way-repeat-image-clamp", AREA_DEFAULT)
 
                 ).map(e -> new Object[] {e, e.testDirectory})