Changeset 4006 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2011-03-26T19:34:21+01:00 (14 years ago)

Author:

bastiK

Message:

mapcss: new LinePattern style element similar to mapnik's LinePatternSymbolizer; split off the text part of LineElemStyle, so it also works for LinePattern

Location:

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

Files:

• ElemStyle.java (modified) (1 diff)
• ElemStyles.java (modified) (8 diffs)
• LineElemStyle.java (modified) (8 diffs)
• LinePatternElemStyle.java (added)
• LineTextElemStyle.java (added)
• mapcss/Instruction.java (modified) (1 diff)

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

@@ -34 +34 @@
 
     public abstract void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, MapPainter painter, boolean selected, boolean member);
+
+    public boolean isProperLineStyle() {
+        return false;
+    }
 
     /**

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

@@ -64 +64 @@
             }
         } else if (osm instanceof Way) {
-            boolean hasNonModifierLine = false;
+            boolean hasProperLineStyle = false;
             for (ElemStyle s : p.a) {
-                if (s instanceof LineElemStyle && !s.isModifier) {
-                    hasNonModifierLine = true;
+                if (s.isProperLineStyle()) {
+                    hasProperLineStyle = true;
                     break;
                 }
             }
-            if (!hasNonModifierLine) {
+            if (!hasProperLineStyle) {
                 AreaElemStyle area = Utils.find(p.a, AreaElemStyle.class);
                 LineElemStyle line = (area == null ? LineElemStyle.UNTAGGED_WAY : LineElemStyle.createSimpleLineStyle(area.color));
@@ -92 +92 @@
 
             boolean isOuterWayOfSomeMP = false;
-            boolean hasIndependentLineElemStyle = false;
             Color wayColor = null;
 
@@ -104 +103 @@
 
                 if (multipolygon.getOuterWays().contains(osm)) {
+                    boolean hasIndependentLineStyle = false;
                     if (!isOuterWayOfSomeMP) { // do this only one time
                         List<ElemStyle> tmp = new ArrayList<ElemStyle>(p.a.size());
@@ -111 +111 @@
                             } else {
                                 tmp.add(s);
+                                if (s.isProperLineStyle()) {
+                                    hasIndependentLineStyle = true;
+                                }
                             }
                         }
                         p.a = new StyleList(tmp);
                         isOuterWayOfSomeMP = true;
-                        hasIndependentLineElemStyle = Utils.exists(p.a, LineElemStyle.class);
-                    }
-
-                    if (!hasIndependentLineElemStyle) {
+                    }
+
+                    if (!hasIndependentLineStyle) {
                         Pair<StyleList, Range> mpElemStyles = getStyleCacheWithRange(r, scale, nc);
-                        LineElemStyle mpLine = Utils.find(mpElemStyles.a, LineElemStyle.class);
+                        ElemStyle mpLine = null;
+                        for (ElemStyle s : mpElemStyles.a) {
+                            if (s.isProperLineStyle()) {
+                                mpLine = s;
+                                break;
+                            }
+                        }
                         if (mpLine != null) {
-                                p.a = new StyleList(p.a, mpLine);
-                                p.b = Range.cut(p.b, mpElemStyles.b);
-                                break;
+                            p.a = new StyleList(p.a, mpLine);
+                            p.b = Range.cut(p.b, mpElemStyles.b);
+                            break;
                         } else if (wayColor == null) {
                             AreaElemStyle mpArea = Utils.find(mpElemStyles.a, AreaElemStyle.class);
@@ -136 +144 @@
             }
             if (isOuterWayOfSomeMP) {
-                if (!Utils.exists(p.a, LineElemStyle.class)) {
+                boolean hasLineStyle = false;
+                for (ElemStyle s : p.a) {
+                    if (s.isProperLineStyle()) {
+                        hasLineStyle = true;
+                        break;
+                    }
+                }
+                if (!hasLineStyle) {
                     p.a = new StyleList(p.a, LineElemStyle.createSimpleLineStyle(wayColor));
                 }
@@ -155 +170 @@
                     boolean hasIndependentElemStyle = false;
                     for (ElemStyle s : p.a) {
-                        if (s instanceof LineElemStyle || s instanceof AreaElemStyle) {
+                        if (s.isProperLineStyle() || s instanceof AreaElemStyle) {
                             hasIndependentElemStyle = true;
                         }
@@ -226 +241 @@
             if (osm instanceof Way) {
                 addIfNotNull(sl, AreaElemStyle.create(c));
+                addIfNotNull(sl, LinePatternElemStyle.create(env));
                 addIfNotNull(sl, LineElemStyle.createLine(env));
                 addIfNotNull(sl, LineElemStyle.createCasing(env));
+                addIfNotNull(sl, LineTextElemStyle.create(env));
             } else if (osm instanceof Node) {
                 addIfNotNull(sl, NodeElemStyle.create(env));
@@ -233 +250 @@
                 if (((Relation)osm).isMultipolygon()) {
                     addIfNotNull(sl, AreaElemStyle.create(c));
+                    addIfNotNull(sl, LinePatternElemStyle.create(env));
                     addIfNotNull(sl, LineElemStyle.createLine(env));
                     addIfNotNull(sl, LineElemStyle.createCasing(env));
+                    addIfNotNull(sl, LineTextElemStyle.create(env));
                 } else if ("restriction".equals(osm.get("type"))) {
                     addIfNotNull(sl, NodeElemStyle.create(env));

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

@@ -30 +30 @@
     public Color color;
     public Color dashesBackground;
-    public TextElement text;
     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, TextElement text, float realWidth) {
+    protected LineElemStyle(Cascade c, BasicStroke line, Color color, BasicStroke dashesLine, Color dashesBackground, float realWidth) {
         super(c, 0f);
         this.line = line;
@@ -41 +40 @@
         this.dashesLine = dashesLine;
         this.dashesBackground = dashesBackground;
-        this.text = text;
         this.realWidth = realWidth;
     }
@@ -181 +179 @@
         }
 
-        TextElement text = null;
-        if (!casing) {
-            Keyword textPos = c.get("text-position", null, Keyword.class);
-            if (textPos == null || equal(textPos.val, "line")) {
-                text = TextElement.create(c, PaintColors.TEXT.get(), false);
-            }
-        }
-
-        return new LineElemStyle(c, line, color, dashesLine, dashesBackground, text, realWidth);
+        return new LineElemStyle(c, line, color, dashesLine, dashesBackground, realWidth);
     }
 
@@ -235 +225 @@
         }
 
-        painter.drawWay(w, myColor, myLine, myDashLine, myDashedColor, text, showOrientation,
+        painter.drawWay(w, myColor, myLine, myDashLine, myDashedColor, showOrientation,
                 showOnlyHeadArrowOnly, showOneway, onewayReversed);
 
@@ -252 +242 @@
 
     @Override
+    public boolean isProperLineStyle() {
+        return !isModifier;
+    }
+
+    @Override
     public boolean equals(Object obj) {
         if (obj == null || getClass() != obj.getClass())
@@ -259 +254 @@
         final LineElemStyle other = (LineElemStyle) obj;
         return  equal(line, other.line) &&
-        equal(color, other.color) &&
-        equal(dashesLine, other.dashesLine) &&
-        equal(dashesBackground, other.dashesBackground) &&
-        equal(text, other.text) &&
-        realWidth == other.realWidth;
+            equal(color, other.color) &&
+            equal(dashesLine, other.dashesLine) &&
+            equal(dashesBackground, other.dashesBackground) &&
+            realWidth == other.realWidth;
     }
 
@@ -273 +267 @@
         hash = 29 * hash + (dashesLine != null ? dashesLine.hashCode() : 0);
         hash = 29 * hash + (dashesBackground != null ? dashesBackground.hashCode() : 0);
-        hash = 29 * hash + (text != null ? text.hashCode() : 0);
         hash = 29 * hash + Float.floatToIntBits(realWidth);
         return hash;
@@ -281 +274 @@
     public String toString() {
         return "LineElemStyle{" + super.toString() + "width=" + line.getLineWidth() +
-        " realWidth=" + realWidth + " color=" + Utils.toString(color) +
-        " dashed=" + Arrays.toString(line.getDashArray()) +
-        (line.getDashPhase() == 0f ? "" : " dashesOffses=" + line.getDashPhase()) +
-        " dashedColor=" + Utils.toString(dashesBackground) + '}';
+            " realWidth=" + realWidth + " color=" + Utils.toString(color) +
+            " dashed=" + Arrays.toString(line.getDashArray()) +
+            (line.getDashPhase() == 0f ? "" : " dashesOffses=" + line.getDashPhase()) +
+            " dashedColor=" + Utils.toString(dashesBackground) + '}';
     }
 }

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java

@@ -40 +40 @@
         public void execute(Environment env) {
             Object value = (val instanceof Expression) ? ((Expression) val).evaluate(env) : val;
-            if (key.equals("icon-image") || key.equals("fill-image")) {
+            if (key.equals("icon-image") || key.equals("fill-image") || key.equals("pattern-image")) {
                 if (value instanceof String) {
                     value = new IconReference((String) value, env.source);