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)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
r11608 r11722 26 26 import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement; 27 27 import org.openstreetmap.josm.gui.mappaint.styleelement.LineElement; 28 import org.openstreetmap.josm.gui.mappaint.styleelement.LineTextElement;29 28 import org.openstreetmap.josm.gui.mappaint.styleelement.NodeElement; 30 29 import org.openstreetmap.josm.gui.mappaint.styleelement.RepeatImageElement; 31 30 import org.openstreetmap.josm.gui.mappaint.styleelement.StyleElement; 31 import org.openstreetmap.josm.gui.mappaint.styleelement.TextElement; 32 32 import org.openstreetmap.josm.gui.mappaint.styleelement.TextLabel; 33 33 import org.openstreetmap.josm.gui.util.GuiHelper; … … 366 366 env.layer = e.getKey(); 367 367 if (osm instanceof Way) { 368 addIfNotNull(sl, AreaElement.create(env)); 368 AreaElement areaStyle = AreaElement.create(env); 369 addIfNotNull(sl, areaStyle); 369 370 addIfNotNull(sl, RepeatImageElement.create(env)); 370 371 addIfNotNull(sl, LineElement.createLine(env)); … … 372 373 addIfNotNull(sl, LineElement.createRightCasing(env)); 373 374 addIfNotNull(sl, LineElement.createCasing(env)); 374 addIfNotNull(sl, LineTextElement.create(env)); 375 addIfNotNull(sl, TextElement.create(env)); 376 if (areaStyle != null) { 377 //TODO: Warn about this, or even remove it completely 378 addIfNotNull(sl, TextElement.createForContent(env)); 379 } 375 380 } else if (osm instanceof Node) { 376 381 NodeElement nodeStyle = NodeElement.create(env); … … 383 388 } else if (osm instanceof Relation) { 384 389 if (((Relation) osm).isMultipolygon()) { 385 addIfNotNull(sl, AreaElement.create(env)); 390 AreaElement areaStyle = AreaElement.create(env); 391 addIfNotNull(sl, areaStyle); 386 392 addIfNotNull(sl, RepeatImageElement.create(env)); 387 393 addIfNotNull(sl, LineElement.createLine(env)); 388 394 addIfNotNull(sl, LineElement.createCasing(env)); 389 addIfNotNull(sl, LineTextElement.create(env)); 395 addIfNotNull(sl, TextElement.create(env)); 396 if (areaStyle != null) { 397 //TODO: Warn about this, or even remove it completely 398 addIfNotNull(sl, TextElement.createForContent(env)); 399 } 390 400 } else if (osm.hasTag("type", "restriction")) { 391 401 addIfNotNull(sl, NodeElement.create(env));
Note:
See TracChangeset
for help on using the changeset viewer.