Changeset 12966 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java

Timestamp:

2017-10-09T17:14:50+02:00 (7 years ago)

Author:

bastiK

Message:

use RenderingHelper in MapCSSRendererTest; move getBackgroundColor() from PaintColors to ElemStyles (no longer global) (see #15273)

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java (modified) (4 diffs)

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

@@ -5 +5 @@
 
 import java.awt.Dimension;
+import java.awt.image.BufferedImage;
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -14 +16 @@
 import java.util.function.Supplier;
 import java.util.logging.Level;
+
+import javax.imageio.ImageIO;
 
 import org.openstreetmap.gui.jmapviewer.OsmMercator;
@@ -155 +159 @@
             RenderingArea area = determineRenderingArea(ds);
             RenderingHelper rh = new RenderingHelper(ds, area.bounds, area.scale, argStyles);
-            rh.setOutputFile(argOutput);
             checkPreconditions(rh);
-            rh.render();
+            BufferedImage image = rh.render();
+            writeImageToFile(image);
         } catch (FileNotFoundException e) {
             if (Logging.isDebugEnabled()) {
@@ -562 +566 @@
         }
     }
+
+    private void writeImageToFile(BufferedImage image) throws IOException {
+        String output = Optional.ofNullable(argOutput).orElse("out.png");
+        ImageIO.write(image, "png", new File(output));
+    }
 }