Changeset 28033 in osm for applications/editors/josm/plugins/opendata/src/org/openstreetmap

Timestamp:

2012-03-10T17:03:47+01:00 (13 years ago)

Author:

donvip

Message:

opendata: CSV robustness, add British national grid projection

Location:

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

Files:

• OdConstants.java (modified) (1 diff)
• io/tabular/CsvReader.java (modified) (2 diffs)

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

@@ -123 +123 @@
      * Coordinates fields
      */
-    public static final String X_STRING = "X|LON|LONGI|LONGITUDE";
-    public static final String Y_STRING = "Y|LAT|LATI|LATITUDE";
+    public static final String X_STRING = "X|LON|LONGI|LONGITUDE|EASTING";
+    public static final String Y_STRING = "Y|LAT|LATI|LATITUDE|NORTHING";
     
     // The list of all ProjectionPatterns (filled at each constrcutor call)

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

@@ -34 +34 @@
         private BufferedReader reader;
         private String line;
-        
+
         public CsvReader(AbstractDataSetHandler handler) {
+                this(handler, ";");
+        }
+
+        public CsvReader(AbstractDataSetHandler handler, String defaultSep) {
                 super(handler);
                 this.charset = handler != null && handler.getCsvCharset() != null ? handler.getCsvCharset() : Charset.forName(UTF8);
-                this.sep = handler != null && handler.getCsvSeparator() != null ? handler.getCsvSeparator() : ";";
+                this.sep = handler != null && handler.getCsvSeparator() != null ? handler.getCsvSeparator() : defaultSep;
         }
         
         public static DataSet parseDataSet(InputStream in, AbstractDataSetHandler handler, ProgressMonitor instance) throws IOException {
-                return new CsvReader(handler).parse(in, instance);
+                CsvReader csvReader = new CsvReader(handler);
+                try {
+                        return csvReader.parse(in, instance);
+                } catch (IllegalArgumentException e) {
+                        if (handler == null) {
+                                // If default sep has been used, try comma
+                                System.out.println(e.getMessage());
+                                CsvReader newReader = new CsvReader(handler, ",");
+                                newReader.initResources(in, instance);
+                                newReader.line = csvReader.line;
+                                return newReader.doParse(newReader.splitLine(), instance);
+                        } else {
+                                throw e;
+                        }
+                }
         }
 
@@ -55 +73 @@
         protected String[] readLine(ProgressMonitor progressMonitor) throws IOException {
                 line = reader.readLine();
+                return splitLine();
+        }
+        
+        private final String[] splitLine() {
                 if (line != null) {
                         return OdUtils.stripQuotes(line.split(sep), sep);