Changeset 11718 in josm for trunk/src

Timestamp:

2017-03-13T14:18:11+01:00 (8 years ago)

Author:

michael2402

Message:

Allow renderer to draw area text / area icon even if no background was specified in this style layer.

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java

@@ -33 +33 @@
     /**
      * If fillImage == null, color is the fill-color, otherwise
-     * an arbitrary color value sampled from the fillImage
+     * an arbitrary color value sampled from the fillImage.
+     *
+     * The color may be fully transparent to indicate that the are should not be filled.
      */
     public Color color;
@@ -118 +120 @@
         }
 
+        TextLabel text = null;
+        Keyword textPos = c.get(TEXT_POSITION, null, Keyword.class);
+        if (textPos == null || "center".equals(textPos.val)) {
+            text = TextLabel.create(env, PaintColors.AREA_TEXT.get(), true);
+        }
+        MapImage iconImage = NodeElement.createIcon(env);
+        RotationAngle rotationAngle = NodeElement.createRotationAngle(env);
+
+        if (iconImage != null || text != null) {
+            // fake a transparent color.
+            color = new Color(0, 0, 0, 0);
+        }
+
         if (color != null) {
-
-            TextLabel text = null;
-            Keyword textPos = c.get(TEXT_POSITION, null, Keyword.class);
-            if (textPos == null || "center".equals(textPos.val)) {
-                text = TextLabel.create(env, PaintColors.AREA_TEXT.get(), true);
-            }
-
             Float extent = c.get(FILL_EXTENT, null, float.class);
             Float extentThreshold = c.get(FILL_EXTENT_THRESHOLD, null, float.class);
-
-            MapImage iconImage = NodeElement.createIcon(env);
-            RotationAngle rotationAngle = NodeElement.createRotationAngle(env);
 
             return new AreaElement(c, color, fillImage, extent, extentThreshold, text, iconImage, rotationAngle);