Changeset 31846 in osm for applications/editors/josm/plugins/seachart/josmtos57/src

Timestamp:

2015-12-21T16:57:17+01:00 (9 years ago)

Author:

malcolmh

Message:

[seachart] add jbasemap

File:

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

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

@@ -29 +29 @@
          */
         
+        /*
+         * To do:
+         * 1. Geometry truncation at cell boundary.
+         * 2. Geometry validation/correction to comply with S57 limitations.
+         * 3. Improvements in mapping of OSM features to S57 objects.
+         */
+
         static byte[] header = {
                 '0', '0', '2', '6', '2', '3', 'L', 'E', '1', ' ', '0', '9', '0', '0', '0', '7', '3', ' ', ' ', ' ', '6', '6', '0', '4', '0', '0', '0', '0', '0', '0', '0', '0',
@@ -64 +71 @@
                 try {
                         Scanner min = new Scanner(new FileInputStream(args[1]));
-                        meta = new HashMap<String, String>();
+                        meta = new HashMap<>();
                         meta.put("FILE", args[3]);
                         while (min.hasNext()) {
@@ -78 +85 @@
                 try {
                         in = new BufferedReader(new FileReader(new File(args[0])));
-                        S57osm.OSMmap(in, map);
+                        try {
+                                S57osm.OSMmap(in, map);
+                        } catch (Exception e) {
+                                System.err.println("Input data error");
+                                System.exit(-1);
+                        }
                         in.close();
                 } catch (IOException e) {
@@ -113 +125 @@
                 idx = header.length;
                 int recs = 2;
-                fields = new ArrayList<Fparams>();
+                fields = new ArrayList<>();
                 fields.add(new Fparams(S57field.CATD, new Object[]{ "CD", recs, args[3], "", "V01X01", "BIN", Math.toDegrees(map.bounds.minlat),
                                 Math.toDegrees(map.bounds.minlon), Math.toDegrees(map.bounds.maxlat), Math.toDegrees(map.bounds.maxlon), String.format("%08X", crc.getValue()), "" }));