Changeset 31722 in osm for applications/editors/josm/plugins/seachart/josmtos57

Timestamp:

2015-10-29T23:01:53+01:00 (9 years ago)

Author:

malcolmh

Message:

[seachart] update

File:

• applications/editors/josm/plugins/seachart/josmtos57/src/josmtos57/Josmtos57.java (modified) (4 diffs)

applications/editors/josm/plugins/seachart/josmtos57/src/josmtos57/Josmtos57.java

@@ -11 +11 @@
 
 import java.io.*;
+import java.util.HashMap;
 import java.util.Scanner;
 import java.util.zip.CRC32;
@@ -60 +61 @@
         static S57map map;
         static byte[] buf;
+        static HashMap<String, String> meta;
         
         public static void main(String[] args) throws IOException {
@@ -72 +74 @@
                 try {
                         Scanner min = new Scanner(new FileInputStream(args[1]));
-                        while (min.hasNext()) {
-                                min.next();
-                        }
+                        meta = new HashMap<String, String>();
+                        meta.put("FILE", args[3]);
+//                      while (min.hasNext()) {
+//                              String[] tokens = min.next().split("=");
+//                              meta.put(tokens[0], tokens[1]);
+//                      }
                         min.close();
                 } catch (IOException e) {
@@ -91 +96 @@
                 try {
                         buf = new byte[5242880];
-                        idx = S57enc.encodeChart(map, buf);
+                        idx = S57enc.encodeChart(map, meta, buf);
                 } catch (IndexOutOfBoundsException e) {
-                        System.err.println("Output file too big (limit 5 MB)");
+                        System.err.println("Output file too big (limit 5 MB) - try smaller areas");
+                        System.exit(-1);
+                } catch (UnsupportedEncodingException e) {
+                        System.err.println("Input data error" + e.getMessage());
                         System.exit(-1);
                 }