Changeset 5812 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2013-03-29T14:44:47+01:00 (11 years ago)

Author:

bastiK

Message:

mapcss: add phase for repeat-image

File:

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

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

@@ -598 +598 @@
     @Deprecated
     public void drawLinePattern(Way way, Image pattern) {
-        drawRepeatImage(way, pattern, 0f, 0f, LineImageAlignment.TOP);
+        drawRepeatImage(way, pattern, 0f, 0f, 0f, LineImageAlignment.TOP);
     }
 
@@ -608 +608 @@
      * @param offset offset from the way
      * @param spacing spacing between two images
+     * @param phase initial spacing
      * @param align alignment of the image. The top, center or bottom edge
      * can be aligned with the way.
      */
-    public void drawRepeatImage(Way way, Image pattern, float offset, float spacing, LineImageAlignment align) {
+    public void drawRepeatImage(Way way, Image pattern, float offset, float spacing, float phase, LineImageAlignment align) {
         final int imgWidth = pattern.getWidth(null);
         final double repeat = imgWidth + spacing;
@@ -617 +618 @@
 
         Point lastP = null;
-        double currentWayLength = 0;
+        double currentWayLength = phase % repeat;
+        if (currentWayLength < 0) {
+            currentWayLength += repeat;
+        }
 
         int dy1, dy2;
@@ -647 +651 @@
                 final double dy = thisP.y - lastP.y;
 
-                double pos = currentWayLength == 0 ? 0 : repeat - (currentWayLength % repeat);
+                // pos is the position from the beginning of the current segment
+                // where an image should be painted
+                double pos = repeat - (currentWayLength % repeat);
 
                 AffineTransform saveTransform = g.getTransform();
@@ -656 +662 @@
                 // is cut off
                 if (pos > spacing) {
-                    g.drawImage(pattern, 0, dy1, (int) (pos - spacing), dy2,
-                            (int) (imgWidth + spacing - pos), 0, imgWidth, imgHeight, null);
+                    // segment is too short for a complete image
+                    if (pos > segmentLength + spacing) {
+                        g.drawImage(pattern, 0, dy1, (int) segmentLength, dy2,
+                                (int) (repeat - pos), 0,
+                                (int) (repeat - pos + segmentLength), imgHeight, null);
+                    // rest of the image fits fully on the current segment
+                    } else {
+                        g.drawImage(pattern, 0, dy1, (int) (pos - spacing), dy2,
+                                (int) (repeat - pos), 0, imgWidth, imgHeight, null);
+                    }
                 }
                 // draw remaining images for this segment