Changeset 30285 in osm for applications/editors/josm/plugins/smed2/src/s57/S57dat.java

Timestamp:

2014-02-17T14:27:01+01:00 (11 years ago)

Author:

malcolmh

Message:

save

File:

• applications/editors/josm/plugins/smed2/src/s57/S57dat.java (modified) (4 diffs)

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

@@ +1 @@
+/* Copyright 2014 Malcolm Herring
+ *
+ * This is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * For a copy of the GNU General Public License, see <http://www.gnu.org/licenses/>.
+ */
+
 package s57;
 
+import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -165 +175 @@
         private static int index;
         private static S57field field;
+        private static String aall = "US-ASCII";
+        private static String nall = "US-ASCII";
         public static int rnum;
         
@@ -219 +231 @@
                 if (conv.bin == 0) {
                         String str = "";
+                        int i = 0;
                         if (conv.asc == 0) {
-                                while (buffer[offset] != 0x1f) {
-                                        str += (char)(buffer[offset++]);
-                                }
-                                offset++;
+                                for (i=0; buffer[offset+i] != 0x1f; i++) {}
+                                try {
+                                        String charset = "";
+                                        if (field == S57field.ATTF) charset = aall;
+                                        else if (field == S57field.NATF) charset = nall;
+                                        else charset = "US-ASCII";
+                                        str = new String(buffer, offset, i, charset);
+                                } catch (UnsupportedEncodingException e) {
+                                        e.printStackTrace();
+                                }
+                                offset += i + 1;
                         } else {
                                 str = new String(buffer, offset, conv.asc);
@@ -239 +259 @@
                                 }
                                 offset += Math.abs(conv.bin);
+                                if ((subf == S57subf.AALL) || (subf == S57subf.NALL)) {
+                                        String charset = "";
+                                        switch ((int)val) {
+                                        case 0:
+                                                charset = "US-ASCII";
+                                                break;
+                                        case 1:
+                                                charset = "ISO-8859-1";
+                                                break;
+                                        case 2:
+                                                charset = "UTF-16LE";
+                                                break;
+                                        }
+                                        if (subf == S57subf.NALL) {
+                                                nall = charset;
+                                        } else {
+                                                aall = charset;
+                                        }
+                                }
                                 return val;
                         } else {