Changeset 30095 in osm for applications/editors/josm

Timestamp:

2013-11-25T01:37:04+01:00 (12 years ago)

Author:

donvip

Message:

[josm_opendata] handle special unicode characters

Location:

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core

Files:

• io/geographic/MifReader.java (modified) (1 diff)
• io/tabular/CsvReader.java (modified) (1 diff)
• util/OdUtils.java (modified) (4 diffs)

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

@@ -458 +458 @@
                         String midLine = midReader.readLine();
                         if (midLine != null) {
-                                String[] fields = OdUtils.stripQuotes(midLine.split(delimiter.toString()), delimiter.toString());
+                                String[] fields = OdUtils.stripQuotesAndExtraChars(midLine.split(delimiter.toString()), delimiter.toString());
                                 if (columns.size() != fields.length) {
                                         System.err.println("Error: Incoherence between MID and MIF files ("+columns.size()+" columns vs "+fields.length+" fields)");

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/CsvReader.java

@@ -80 +80 @@
         private final String[] splitLine() {
                 if (line != null) {
-                        return OdUtils.stripQuotes(line.split(sep), sep);
+                        return OdUtils.stripQuotesAndExtraChars(line.split(sep), sep);
                 } else {
                         return null;

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/util/OdUtils.java

@@ -21 +21 @@
 import java.util.ArrayList;
 import java.util.List;
+import java.util.ListIterator;
 import java.util.Locale;
 
@@ -31 +32 @@
 import org.openstreetmap.josm.plugins.opendata.core.modules.ModuleHandler;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
 
 public abstract class OdUtils {
@@ -40 +42 @@
     }
     
-        public static final String[] stripQuotes(String[] split, String sep) {
+        public static final String[] stripQuotesAndExtraChars(String[] split, String sep) {
                 List<String> result = new ArrayList<String>();
                 boolean append = false;
@@ -58 +60 @@
                                 result.add(split[i]);
                         }
+                }
+                // Remove exotic characters such as U+FEFF found in some CSV files
+                for (ListIterator<String> it = result.listIterator(); it.hasNext();) {
+                    it.set(Utils.strip(it.next()));
                 }
                 return result.toArray(new String[0]);