Changeset 34017 in osm for applications

Timestamp:

2018-01-16T19:42:25+01:00 (7 years ago)

Author:

donvip

Message:

see #josm15784 - correct parsing of shapefile codepages

File:

• applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReader.java (modified) (2 diffs)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReader.java

@@ -18 +18 @@
 import java.nio.file.Path;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
@@ -192 +193 @@
                     if (Files.exists(cpg)) {
                         try (BufferedReader reader = Files.newBufferedReader(cpg, StandardCharsets.UTF_8)) {
-                            charset = Charset.forName(reader.readLine());
+                            String cs = reader.readLine();
+                            if (cs.matches("\\d+")) {
+                                // We only have the code page number, we need to find the good alias for java.nio API
+                                // see https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html
+                                for (String prefix : Arrays.asList("IBM", "IBM0", "IBM00", "x-IBM", "ISO-", "windows-", "x-windows-")) {
+                                    try {
+                                        charset = Charset.forName(prefix+cs);
+                                        break;
+                                    } catch (UnsupportedCharsetException | IllegalCharsetNameException e) {
+                                        Logging.trace(e);
+                                    }
+                                }
+                            } else {
+                                // We may have a charset name, such as "UTF-8"
+                                charset = Charset.forName(cs);
+                            }
                         } catch (IOException | UnsupportedCharsetException | IllegalCharsetNameException e) {
                             Logging.warn(e);