Changeset 11722 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.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/ElemStyles.java (modified) (4 diffs)

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

@@ -26 +26 @@
 import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement;
 import org.openstreetmap.josm.gui.mappaint.styleelement.LineElement;
-import org.openstreetmap.josm.gui.mappaint.styleelement.LineTextElement;
 import org.openstreetmap.josm.gui.mappaint.styleelement.NodeElement;
 import org.openstreetmap.josm.gui.mappaint.styleelement.RepeatImageElement;
 import org.openstreetmap.josm.gui.mappaint.styleelement.StyleElement;
+import org.openstreetmap.josm.gui.mappaint.styleelement.TextElement;
 import org.openstreetmap.josm.gui.mappaint.styleelement.TextLabel;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -366 +366 @@
             env.layer = e.getKey();
             if (osm instanceof Way) {
-                addIfNotNull(sl, AreaElement.create(env));
+                AreaElement areaStyle = AreaElement.create(env);
+                addIfNotNull(sl, areaStyle);
                 addIfNotNull(sl, RepeatImageElement.create(env));
                 addIfNotNull(sl, LineElement.createLine(env));
@@ -372 +373 @@
                 addIfNotNull(sl, LineElement.createRightCasing(env));
                 addIfNotNull(sl, LineElement.createCasing(env));
-                addIfNotNull(sl, LineTextElement.create(env));
+                addIfNotNull(sl, TextElement.create(env));
+                if (areaStyle != null) {
+                    //TODO: Warn about this, or even remove it completely
+                    addIfNotNull(sl, TextElement.createForContent(env));
+                }
             } else if (osm instanceof Node) {
                 NodeElement nodeStyle = NodeElement.create(env);
@@ -383 +388 @@
             } else if (osm instanceof Relation) {
                 if (((Relation) osm).isMultipolygon()) {
-                    addIfNotNull(sl, AreaElement.create(env));
+                    AreaElement areaStyle = AreaElement.create(env);
+                    addIfNotNull(sl, areaStyle);
                     addIfNotNull(sl, RepeatImageElement.create(env));
                     addIfNotNull(sl, LineElement.createLine(env));
                     addIfNotNull(sl, LineElement.createCasing(env));
-                    addIfNotNull(sl, LineTextElement.create(env));
+                    addIfNotNull(sl, TextElement.create(env));
+                    if (areaStyle != null) {
+                        //TODO: Warn about this, or even remove it completely
+                        addIfNotNull(sl, TextElement.createForContent(env));
+                    }
                 } else if (osm.hasTag("type", "restriction")) {
                     addIfNotNull(sl, NodeElement.create(env));