Changeset 32380 in osm for applications/editors/josm/plugins/seachart/src/s57

Timestamp:

2016-06-23T14:17:55+02:00 (9 years ago)

Author:

malcolmh

Message:

updates

Location:

applications/editors/josm/plugins/seachart/src/s57

Files:

• S57dat.java (modified) (2 diffs)
• S57dec.java (modified) (8 diffs)
• S57map.java (modified) (1 diff)
• S57val.java (modified) (1 diff)

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

@@ -224 +224 @@
                 } else {
                         int f = Math.abs(conv.bin);
-                        if (f < 8) {
+                        if (f < 5) {
                                 long val = buffer[offset + --f];
                                 if (conv.bin > 0)
@@ -253 +253 @@
                                 return val;
                         } else {
-                                f /= 8;
-                                long val = 0;
-                                for (int i = 0; i < f; i++) {
+                                if (f == 5) {
+                                        long val = buffer[offset++] & 0xff;
+                                        f--;
+                                        while (f > 0) {
+                                                val = (val << 8) + (buffer[offset + --f] & 0xff);
+                                        }
+                                        offset += 4;
+                                        return val;
+                                } else {
+                                        long val = buffer[offset++] & 0xff;
                                         val = (val << 8) + (buffer[offset++] & 0xff);
-                                }
-                                return val;
+                                        f = 4;
+                                        while (f > 0) {
+                                                val = (val << 8) + (buffer[offset + --f] & 0xff);
+                                        }
+                                        offset += 4;
+                                        f = 2;
+                                        while (f > 0) {
+                                                val = (val << 8) + (buffer[offset + --f] & 0xff);
+                                        }
+                                        offset += 2;
+                                        return val;
+                                }
                         }
                 }

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

@@ -21 +21 @@
                 S57dat.rnum = 0;
                 byte[] leader = new byte[24];
+                byte[] record = new byte[0];
                 boolean ddr = false;
                 int length = 0;
@@ -40 +41 @@
                         try {
                         length = Integer.parseInt(new String(leader, 0, 5)) - 24;
+                        record = new byte[length];
                         ddr = (leader[6] == 'L');
                         fields = Integer.parseInt(new String(leader, 12, 5)) - 24;
@@ -50 +52 @@
                         mapts = leader[23] - '0';
                         entry = mapfl + mapfp + mapts;
-                        byte[] record = new byte[length];
                         if (in.read(record) != length)
                                 break;
@@ -61 +62 @@
                                         case "0001":
                                                 int i8rn = ((Long) S57dat.decSubf(record, fields + pos, S57field.I8RI, S57subf.I8RN)).intValue();
-                                                if (i8rn != ++S57dat.rnum) {
-                                                        System.err.println("Out of order record ID");
-                                                        in.close();
-                                                        System.exit(-1);
-                                                }
+//                                              if (i8rn != ++S57dat.rnum) {
+//                                                      System.err.println("Out of order record ID");
+//                                                      in.close();
+//                                                      System.exit(-1);
+//                                              }
                                                 break;
                                         case "DSSI":
@@ -93 +94 @@
                                                 break;
                                         case "FOID":
-                                                name = (Long) S57dat.decSubf(record, fields + pos, S57field.LNAM, S57subf.LNAM);
+                                                name = (long) S57dat.decSubf(record, fields + pos, S57field.LNAM, S57subf.LNAM);
                                                 map.newFeature(name, pflag, objl);
                                                 break;
@@ -109 +110 @@
                                                 S57dat.setField(record, fields + pos, S57field.FFPT, len);
                                                 do {
-                                                        name = (Long) S57dat.decSubf(S57subf.LNAM);
+                                                        name = (long) S57dat.decSubf(S57subf.LNAM);
                                                         int rind = ((Long) S57dat.decSubf(S57subf.RIND)).intValue();
                                                         S57dat.decSubf(S57subf.COMT);
-                                                        map.newObj(name, rind);
+                                                        map.refObj(name, rind);
                                                 } while (S57dat.more());
                                                 break;
@@ -118 +119 @@
                                                 S57dat.setField(record, fields + pos, S57field.FSPT, len);
                                                 do {
-                                                        name = (Long) S57dat.decSubf(S57subf.NAME) << 16;
+                                                        name = (long) S57dat.decSubf(S57subf.NAME) << 16;
                                                         map.newPrim(name, (Long) S57dat.decSubf(S57subf.ORNT), (Long) S57dat.decSubf(S57subf.USAG));
                                                         S57dat.decSubf(S57subf.MASK);
@@ -138 +139 @@
                                                 }
                                                 name <<= 32;
-                                                name += (Long) S57dat.decSubf(S57subf.RCID);
+                                                name += (long) S57dat.decSubf(S57subf.RCID);
                                                 name <<= 16;
                                                 if (nflag == Nflag.ANON) {

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

@@ -273 +273 @@
         }
         
-        public void newObj(long id, int rind) {
+        public void refObj(long id, int rind) {
                 Rflag r = Rflag.UNKN;
                 switch (rind) {

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

@@ -812 +812 @@
   Catnmk.put(CatNMK.NMK_WEIR, new S57enum(52, "weir")); Catnmk.put(CatNMK.NMK_FERN, new S57enum(53, "ferry_non_independent"));  Catnmk.put(CatNMK.NMK_FERI, new S57enum(54, "ferry_independent"));
   Catnmk.put(CatNMK.NMK_BRTP, new S57enum(55, "berthing_permitted")); Catnmk.put(CatNMK.NMK_BTLL, new S57enum(56, "berthing_lateral_limit")); Catnmk.put(CatNMK.NMK_BTLS, new S57enum(57, "berthing_lateral_limits"));
-   Catnmk.put(CatNMK.NMK_BTRL, new S57enum(58, "berthing_rafting_limit"));  Catnmk.put(CatNMK.NMK_BTUP, new S57enum(59, "berthing_unmarked_pushing"));
+   Catnmk.put(CatNMK.NMK_BTRL, new S57enum(58, "berth_rafting_limit"));  Catnmk.put(CatNMK.NMK_BTUP, new S57enum(59, "berthing_unmarked_pushing"));
    Catnmk.put(CatNMK.NMK_BTP1, new S57enum(60, "berthing_marked_pushing_1")); Catnmk.put(CatNMK.NMK_BTP2, new S57enum(61, "berthing_marked_pushing_2"));
    Catnmk.put(CatNMK.NMK_BTP3, new S57enum(62, "berthing_marked_pushing_3")); Catnmk.put(CatNMK.NMK_BTUN, new S57enum(63, "berthing_unmarked_non-pushing"));