Changeset 4055 in josm for trunk

Timestamp:

2011-04-22T23:58:10+02:00 (14 years ago)

Author:

bastiK

Message:

#6246 - area edges painted above highway

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• ElemStyles.java (modified) (3 diffs)
• LineElemStyle.java (modified) (1 diff)

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

@@ -73 +73 @@
             if (!hasProperLineStyle) {
                 AreaElemStyle area = Utils.find(p.a, AreaElemStyle.class);
-                LineElemStyle line = (area == null ? LineElemStyle.UNTAGGED_WAY : LineElemStyle.createSimpleLineStyle(area.color));
+                LineElemStyle line = (area == null ? LineElemStyle.UNTAGGED_WAY : LineElemStyle.createSimpleLineStyle(area.color, true));
                 p.a = new StyleList(p.a, line);
             }
@@ -152 +152 @@
                 }
                 if (!hasLineStyle) {
-                    p.a = new StyleList(p.a, LineElemStyle.createSimpleLineStyle(wayColor));
+                    p.a = new StyleList(p.a, LineElemStyle.createSimpleLineStyle(wayColor, true));
                 }
                 return p;
@@ -183 +183 @@
                             }
                         }
-                        p.a = new StyleList(p.a, LineElemStyle.createSimpleLineStyle(mpColor));
+                        p.a = new StyleList(p.a, LineElemStyle.createSimpleLineStyle(mpColor, true));
                     }
                     return p;

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

@@ -18 +18 @@
 public class LineElemStyle extends ElemStyle {
 
-    public static LineElemStyle createSimpleLineStyle(Color color) {
+    public static LineElemStyle createSimpleLineStyle(Color color, boolean isAreaEdge) {
         MultiCascade mc = new MultiCascade();
         Cascade c = mc.getOrCreateCascade("default");
         c.put("width", Keyword.DEFAULT);
         c.put("color", color != null ? color : PaintColors.UNTAGGED.get());
+        if (isAreaEdge) {
+            c.put("z-index", -3f);
+        }
         return createLine(new Environment(null, mc, "default", null));
     }
-    public static final LineElemStyle UNTAGGED_WAY = createSimpleLineStyle(null);
+    public static final LineElemStyle UNTAGGED_WAY = createSimpleLineStyle(null, false);
 
     private BasicStroke line;