Changeset 36169 in osm for applications/editors/josm/plugins/seachart/jrenderpgsql/src

Timestamp:

2023-10-12T21:13:32+02:00 (12 months ago)

Author:

taylor.smock

Message:

Fix #23157: Change S57osm.OSMmap to accept either a file or inputstream (patch by oobayly)

File:

• applications/editors/josm/plugins/seachart/jrenderpgsql/src/jrenderpgsql/JrenderPgsql.java (modified) (3 diffs)

applications/editors/josm/plugins/seachart/jrenderpgsql/src/jrenderpgsql/JrenderPgsql.java

@@ -7 +7 @@
 import java.awt.geom.Point2D;
 import java.awt.image.BufferedImage;
-import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
 import java.io.StringReader;
 import java.io.ByteArrayOutputStream;
 import java.io.FileOutputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -396 +397 @@
         // library where it will be parsed again.
 
-        BufferedReader in = new BufferedReader(new StringReader(combinedBuf.toString()));
+        ByteArrayInputStream in = new ByteArrayInputStream(combinedBuf.toString().getBytes(StandardCharsets.UTF_8));
         map = new S57map(true);
         S57osm.OSMmap(in, map, false);
@@ -427 +428 @@
             public RuleSet ruleset() {
                 return RuleSet.SEAMARK;
+            }
+
+            public Chart chart() {
+              return null;
+            }
+
+            public int grid() {
+              return 0;
             }
         };