Changeset 11722 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java

Timestamp:

2017-03-13T17:04:29+01:00 (7 years ago)

Author:

michael2402

Message:

Do not include text label in area style - use a separate class and start merging code for on-line and in-area drawing.

File:

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

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

@@ -10 +10 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
-import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
 import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.gui.mappaint.Cascade;
 import org.openstreetmap.josm.gui.mappaint.Environment;
-import org.openstreetmap.josm.gui.mappaint.Keyword;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference;
 import org.openstreetmap.josm.gui.util.RotationAngle;
@@ -120 +118 @@
         }
 
-        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);
-        }
+        TextLabel text = null; // <- text is handled by TextElement
         MapImage iconImage = NodeElement.createIcon(env);
         RotationAngle rotationAngle = NodeElement.createRotationAngle(env);
 
-        if (iconImage != null || text != null) {
+        if (iconImage != null) {
             // fake a transparent color.
             color = new Color(0, 0, 0, 0);