Changeset 12964 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2017-10-09T15:22:45+02:00 (3 years ago)

Author:

bastiK

Message:

see #15273 - more straightforward way to set up the styles for rendering

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/RenderingHelper.java (modified) (3 diffs)

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

@@ -23 +23 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
 import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
-import org.openstreetmap.josm.data.preferences.sources.SourceEntry;
-import org.openstreetmap.josm.data.preferences.sources.SourceType;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.NavigatableComponent;
@@ -100 +98 @@
     public void render() throws IOException, IllegalDataException {
         // load the styles
+        ElemStyles elemStyles = new ElemStyles();
         MapCSSStyleSource.STYLE_SOURCE_LOCK.writeLock().lock();
         try {
-            MapPaintStyles.getStyles().clear();
             for (StyleData sd : styles) {
-                SourceEntry se = new SourceEntry(SourceType.MAP_PAINT_STYLE, sd.styleUrl,
-                            "cliRenderingStyle", "cli rendering style '" + sd.styleUrl + "'", true /* active */);
-                StyleSource source = MapPaintStyles.addStyle(se);
+                MapCSSStyleSource source = new MapCSSStyleSource(sd.styleUrl, "cliRenderingStyle", "cli rendering style '" + sd.styleUrl + "'");
+                source.loadStyleSource();
+                elemStyles.add(source);
                 if (!source.getErrors().isEmpty()) {
                     throw new IllegalDataException("Failed to load style file. Errors: " + source.getErrors());
@@ -156 +154 @@
         g.setColor(PaintColors.getBackgroundColor());
         g.fillRect(0, 0, imgDimPx.width, imgDimPx.height);
-        new StyledMapRenderer(g, nc, false).render(ds, false, bounds);
+        StyledMapRenderer smr = new StyledMapRenderer(g, nc, false);
+        smr.setStyles(elemStyles);
+        smr.render(ds, false, bounds);
 
         // write to file