Changeset 31738 in osm for applications/editors/josm/plugins/seachart/src/s57/S57enc.java

Timestamp:

2015-11-13T11:13:11+01:00 (9 years ago)

Author:

malcolmh

Message:

[seachart] bug fixes

File:

• applications/editors/josm/plugins/seachart/src/s57/S57enc.java (modified) (4 diffs)

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

@@ -108 +108 @@
         static final double SOMF=10;
         
+        static int intu = 4;
         static int agen = 3878;
         static int cscl = 10000;
@@ -138 +139 @@
                 String date = new SimpleDateFormat("yyyyMMdd").format(Calendar.getInstance().getTime());
                 ArrayList<Fparams> ds = new ArrayList<Fparams>();
-                ds.add(new Fparams(S57field.DSID, new Object[] { 10, 1, 1, 4, "0S000000.000", 1, 0, date, date, "03.1", 1, "ENC", "", 1, agen, "Generated by OpenSeaMap.org" }));
+                ds.add(new Fparams(S57field.DSID, new Object[] { 10, 1, 1, intu, "0S000000.000", 1, 0, date, date, "03.1", 1, "ENC", "2.0", 1, agen, "Generated by OpenSeaMap.org" }));
                 ds.add(new Fparams(S57field.DSSI, new Object[] { 2, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0 }));
                 ArrayList<Fparams> dp = new ArrayList<Fparams>();
@@ -240 +241 @@
 
                                 ArrayList<Fparams> geom = new ArrayList<Fparams>();
-                                int outers = (feature.geom.prim == Pflag.POINT) ? 1 : feature.geom.comps.get(0).size;
+                                int outers = 0;
+try{
+                                outers = (feature.geom.prim == Pflag.POINT) ? 1 : feature.geom.comps.get(0).size;
+} catch (IndexOutOfBoundsException e) {
+        int x=0;
+}
                                 for (Prim elem : feature.geom.elems) {
                                         if (feature.geom.prim == Pflag.POINT) {
@@ -330 +336 @@
                 // Re-write DSID/DSSI with final totals
                 ds = new ArrayList<Fparams>();
-                ds.add(new Fparams(S57field.DSID, new Object[] { 10, 1, 1, 4, "0S000000.000", 1, 0, date, date, "03.1", 1, "ENC", "", 1, agen, "Generated by OpenSeaMap.org" }));
+                ds.add(new Fparams(S57field.DSID, new Object[] { 10, 1, 1, intu, "0S000000.000", 1, 0, date, date, "03.1", 1, "ENC", "2.0", 1, agen, "Generated by OpenSeaMap.org" }));
                 ds.add(new Fparams(S57field.DSSI, new Object[] { 2, 1, 2, metas, 0, geos, 0, isols, conns, edges, 0 }));
                 record = S57dat.encRecord(1, ds);