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

Timestamp:

2023-10-12T21:13:32+02:00 (15 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/src/s57/S57osm.java (modified) (3 diffs)

applications/editors/josm/plugins/seachart/src/s57/S57osm.java

@@ -3 +3 @@
 
 import java.io.File;
+import java.io.InputStream;
+import java.io.FileInputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -98 +100 @@
     }
 
-    public static void OSMmap(File in, S57map map, boolean bb) throws Exception {
+    public static void OSMmap(File file, S57map map, boolean bb) throws Exception {
+        try (InputStream in = new FileInputStream(file)) {
+          OSMmap(in, map, bb);
+        }
+    }
+
+    public static void OSMmap(InputStream in, S57map map, boolean bb) throws Exception {
+        DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
+        DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
+        Document doc = dBuilder.parse(in);
+
+        OSMmap(doc, map, bb);
+    }
+
+    public static void OSMmap(Document doc, S57map map, boolean bb) throws Exception {
         double lat = 0;
         double lon = 0;
@@ -113 +129 @@
         map.nodes.put(4L, new Snode());
 
-        DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
-        DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
-        Document doc = dBuilder.parse(in);
         doc.getDocumentElement().normalize();
         if (!doc.getDocumentElement().getNodeName().equals("osm")) {