Changeset 4316 in josm for trunk/src

Timestamp:

2011-08-13T19:51:31+02:00 (13 years ago)

Author:

bastiK

Message:

mapcss: add line offset

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/paint/StyledMapRenderer.java (modified) (2 diffs)
• gui/mappaint/LineElemStyle.java (modified) (8 diffs)

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

@@ -202 +202 @@
     @Override
     public void render(final DataSet data, boolean renderVirtualNodes, Bounds bounds) {
-        //long start = System.currentTimeMillis();
+        long start = System.currentTimeMillis();
         BBox bbox = new BBox(bounds);
 
@@ -226 +226 @@
         collectWayStyles(data, sc, bbox);
         collectRelationStyles(data, sc, bbox);
-        //long phase1 = System.currentTimeMillis();
+        long phase1 = System.currentTimeMillis();
         sc.drawAll();
         sc = null;
         painter.drawVirtualNodes(data.searchWays(bbox));
 
-        //long now = System.currentTimeMillis();
-        //System.err.println(String.format("PAINTING TOOK %d [PHASE1 took %d] (at scale %s)", now - start, phase1 - start, circum));
+        long now = System.currentTimeMillis();
+        System.err.println(String.format("PAINTING TOOK %d [PHASE1 took %d] (at scale %s)", now - start, phase1 - start, circum));
     }
 }

trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java

@@ -33 +33 @@
     public Color color;
     public Color dashesBackground;
+    public int offset;
     public float realWidth; // the real width of this line in meter
 
     private BasicStroke dashesLine;
 
-    protected LineElemStyle(Cascade c, BasicStroke line, Color color, BasicStroke dashesLine, Color dashesBackground, float realWidth) {
+    protected LineElemStyle(Cascade c, BasicStroke line, Color color, BasicStroke dashesLine, Color dashesBackground, int offset, float realWidth) {
         super(c, 0f);
         this.line = line;
@@ -43 +44 @@
         this.dashesLine = dashesLine;
         this.dashesBackground = dashesBackground;
+        this.offset = offset;
         this.realWidth = realWidth;
     }
@@ -175 +177 @@
         BasicStroke dashesLine = null;
 
+        float offset = c.get("offset", 0f, Float.class);
+
         if (dashes != null && dashesBackground != null) {
             float[] dashes2 = new float[dashes.length];
@@ -182 +186 @@
         }
 
-        return new LineElemStyle(c, line, color, dashesLine, dashesBackground, realWidth);
+        return new LineElemStyle(c, line, color, dashesLine, dashesBackground, (int) offset, realWidth);
     }
 
@@ -228 +232 @@
         }
 
-        painter.drawWay(w, myColor, myLine, myDashLine, myDashedColor, showOrientation,
+        painter.drawWay(w, myColor, myLine, myDashLine, myDashedColor, offset, showOrientation,
                 showOnlyHeadArrowOnly, showOneway, onewayReversed);
 
@@ -260 +264 @@
             equal(dashesLine, other.dashesLine) &&
             equal(dashesBackground, other.dashesBackground) &&
+            offset == other.offset &&
             realWidth == other.realWidth;
     }
@@ -270 +275 @@
         hash = 29 * hash + (dashesLine != null ? dashesLine.hashCode() : 0);
         hash = 29 * hash + (dashesBackground != null ? dashesBackground.hashCode() : 0);
+        hash = 29 * hash + offset;
         hash = 29 * hash + Float.floatToIntBits(realWidth);
         return hash;
@@ -283 +289 @@
             " linejoin=" + linejoinToString(line.getLineJoin()) +
             " linecap=" + linecapToString(line.getEndCap()) +
+            (offset == 0 ? "" : " offset=" + offset) +
             '}';
     }