- Timestamp:
- 2017-04-16T20:54:54+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/mappaint
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
r11384 r11932 612 612 @Override 613 613 public void apply(MultiCascade mc, OsmPrimitive osm, double scale, boolean pretendWayIsClosed) { 614 Environment env = new Environment(osm, mc, null, this);615 614 MapCSSRuleIndex matchingRuleIndex; 616 615 if (osm instanceof Node) { … … 634 633 } 635 634 635 Environment env = new Environment(osm, mc, null, this); 636 636 // the declaration indices are sorted, so it suffices to save the last used index 637 637 int lastDeclUsed = -1; -
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java
r11797 r11932 79 79 80 80 private static NodeElement create(Environment env, float defaultMajorZindex, boolean allowDefault) { 81 Cascade c = env.mc.getCascade(env.layer);82 83 81 MapImage mapImage = createIcon(env); 84 82 Symbol symbol = null; … … 87 85 } 88 86 89 RotationAngle rotationAngle = createRotationAngle(env);90 91 87 // optimization: if we neither have a symbol, nor a mapImage 92 88 // we don't have to check for the remaining style properties and we don't … … 94 90 if (!allowDefault && symbol == null && mapImage == null) return null; 95 91 92 Cascade c = env.mc.getCascade(env.layer); 93 RotationAngle rotationAngle = createRotationAngle(env); 96 94 return new NodeElement(c, mapImage, symbol, defaultMajorZindex, rotationAngle); 97 95 } -
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextElement.java
r11748 r11932 33 33 */ 34 34 public static TextElement create(final Environment env) { 35 final Cascade c = env.mc.getCascade(env.layer);36 37 35 TextLabel text = TextLabel.create(env, PaintColors.TEXT.get(), false); 38 36 if (text == null) 39 37 return null; 38 final Cascade c = env.mc.getCascade(env.layer); 40 39 return new TextElement(c, text); 41 40 }
Note:
See TracChangeset
for help on using the changeset viewer.