Changeset 31735 in osm for applications/editors/josm/plugins/seachart/src/s57/S57dat.java

Timestamp:

2015-11-08T09:49:14+01:00 (9 years ago)

Author:

malcolmh

Message:

[seachart] update

File:

• applications/editors/josm/plugins/seachart/src/s57/S57dat.java (modified) (3 diffs)

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

@@ -262 +262 @@
         public static byte[] encSubf(S57subf subf, Object val) {
                 S57conv conv = convs.get(subf);
-                if (conv.bin == 0) {
+                if ((conv.bin == 0) || asc) {
                         String sval = "";
                         if (val instanceof String) {
                                 sval = (String) val;
+                        } else if (val instanceof Integer) {
+                                sval = ((Integer)val).toString();
                         } else if (val instanceof Long) {
                                 sval = ((Long)val).toString();
@@ -328 +330 @@
         };
 
+        static boolean asc = false;
+        
+        public static byte[] encRecord(String i8rn, ArrayList<Fparams> fparams) {
+                asc = true;
+                return encRecord(Integer.parseInt(i8rn), fparams);
+        }
+        
         public static byte[] encRecord(int i8rn, ArrayList<Fparams> fparams) {
                 ArrayList<Index> index = new ArrayList<Index>();
@@ -380 +389 @@
                 System.arraycopy(String.format("%05d", fbuf.length).getBytes(), 0, fbuf, 0, 5);
                 System.arraycopy(String.format("%05d", (leader.length + ibuf.length)).getBytes(), 0, fbuf, 12, 5);
+                asc = false;
                 return fbuf;
         }