Changeset 5749 in josm

Timestamp:

2013-03-02T00:51:28+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #8473 - Export GeoJSON as UTF-8 (patch by oschrenk)

File:

• trunk/src/org/openstreetmap/josm/io/GeoJSONExporter.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/GeoJSONExporter.java

@@ -2 +2 @@
 package org.openstreetmap.josm.io;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 public class GeoJSONExporter extends FileExporter {
@@ -23 +28 @@
         if (layer instanceof OsmDataLayer) {
             String json = new GeoJSONWriter((OsmDataLayer) layer).write();
-            FileWriter out = new FileWriter(file);
-            out.write(json);
-            out.close();
+            Writer out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), "UTF-8"));
+            try {
+                out.write(json);
+            } finally {
+                out.close();
+            }
         } else {
             throw new IllegalArgumentException(tr("Layer ''{0}'' not supported", layer.getClass().toString()));