Changeset 30323 in osm for applications/editors/josm/plugins/smed2/js57toosm/src

Timestamp:

2014-03-14T12:32:18+01:00 (11 years ago)

Author:

malcolmh

Message:

save

File:

• applications/editors/josm/plugins/smed2/js57toosm/src/js57toosm/Js57toosm.java (modified) (3 diffs)

applications/editors/josm/plugins/smed2/js57toosm/src/js57toosm/Js57toosm.java ¶

@@ -33 +33 @@
                 ArrayList<Long> done = new ArrayList<Long>();
 
-                if (args.length < 1) {
-                        System.err.println("Usage: java -jar js57toosm.jar S57_filename [types_filename]");
+                if (args.length < 3) {
+                        System.err.println("Usage: java -jar js57toosm.jar S57_filename types_filename OSM_filename");
                         System.exit(-1);
                 }
                 in = new FileInputStream(args[0]);
-                out = System.out;
+                out = new PrintStream(args[2]);
                 ArrayList<Obj> types = new ArrayList<Obj>();
-                if (args.length == 2) {
                         Scanner tin = new Scanner(new FileInputStream(args[1]));
                         while (tin.hasNext()) {
@@ -48 +47 @@
                         }
                         tin.close();
-                }
                 
                 map = new S57map();
-                MapBounds bounds = S57dec.decodeFile(in, types, map);
+                MapBounds bounds = S57dec.decodeFile(in, map);
 
                 out.format("<?xml version='1.0' encoding='UTF-8'?>%n");
@@ -168 +166 @@
                 }
                 out.println("</osm>\n");
+                out.close();
+                System.out.println("Finished");
         }