Changeset 35392 in osm for applications/editors/josm/plugins/seachart/jbasemap

Timestamp:

2020-03-22T12:03:02+01:00 (6 years ago)

Author:

malcolmh

Message:

use XML DOM to parse OSM files

File:

• applications/editors/josm/plugins/seachart/jbasemap/src/jbasemap/Jbasemap.java (modified) (3 diffs)

applications/editors/josm/plugins/seachart/jbasemap/src/jbasemap/Jbasemap.java

@@ -6 +6 @@
 import java.awt.geom.Point2D;
 import java.io.BufferedReader;
-import java.io.FileReader;
+import java.io.File;
 import java.io.IOException;
 
@@ -63 +63 @@
 
         @Override
+        public int grid() {
+            return 0;
+        }
+
+        @Override
         public boolean clip() {
             return true;
@@ -116 +121 @@
         z2 = Math.pow(2, zoom);
         double scale = 0.1;
+        File in = new File(src);
+        map = new S57map(false);
         try {
-            BufferedReader in = new BufferedReader(new FileReader(src));
-            map = new S57map(false);
-            try {
-                S57osm.OSMmap(in, map, true);
-            } catch (Exception e) {
-                System.err.println("Input data error");
-                System.exit(-1);
-            }
-            in.close();
-        } catch (IOException e) {
-            System.err.println("Input file: " + e.getMessage());
+            S57osm.OSMmap(in, map, true);
+        } catch (Exception e) {
+            System.err.println("Input data error");
             System.exit(-1);
         }