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

Timestamp:

2013-06-12T22:43:44+02:00 (12 years ago)

Author:

donvip

Message:

[josm_opendata] update Toulouse module + plugin robustness

Location:

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

Files:

• OdConstants.java (modified) (1 diff)
• io/tabular/SpreadSheetReader.java (modified) (1 diff)
• modules/AbstractModule.java (modified) (1 diff)

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

@@ -129 +129 @@
      * Coordinates fields
      */
-    public static final String X_STRING = "X|LON|LONGI|LONGITUDE.*|EASTING";
-    public static final String Y_STRING = "Y|LAT|LATI|LATITUDE.*|NORTHING";
+    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 constructor call)

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

@@ -183 +183 @@
                         }
                         
-                        for (int i = 0; i<fields.length; i++) {
+                        if (fields.length > header.length) {
+                            Main.warn(tr("Invalid file. Bad length on line {0}. Expected {1} columns, got {2}.", lineNumber, header.length, fields.length));
+                            Main.warn(Arrays.toString(fields));
+                        }
+                        
+                        for (int i = 0; i<Math.min(fields.length, header.length); i++) {
                                 try {
-                                        if (i >= header.length) {
-                                                throw new IllegalArgumentException(tr("Invalid file. Bad length on line {0}. Expected {1} columns, got {2}.", lineNumber, header.length, i+1));
-                                        } else {
-                                            boolean coordinate = false;
-                                            for (CoordinateColumns c : columns) {
-                                                EastNorth en = ens.get(c);
-                                if (i == c.xCol) {
-                                    coordinate = true;
-                                    en.setLocation(parseDouble(fields[i]), en.north());
-                                    if (handler != null) {
-                                        handler.setXCol(i);
-                                    }
-                                } else if (i == c.yCol) {
-                                coordinate = true;
-                                    en.setLocation(en.east(), parseDouble(fields[i]));
-                                    if (handler != null) {
-                                        handler.setYCol(i);
-                                    }
-                                }                                               
-                                            }
-                            if (!coordinate) {
-                                if (!fields[i].isEmpty()) {
-                                    nodes.values().iterator().next().put(header[i], fields[i]);
-                                }
-                            }
-                                        }
+                                    boolean coordinate = false;
+                                    for (CoordinateColumns c : columns) {
+                                        EastNorth en = ens.get(c);
+                        if (i == c.xCol) {
+                            coordinate = true;
+                            en.setLocation(parseDouble(fields[i]), en.north());
+                            if (handler != null) {
+                                handler.setXCol(i);
+                            }
+                        } else if (i == c.yCol) {
+                            coordinate = true;
+                            en.setLocation(en.east(), parseDouble(fields[i]));
+                            if (handler != null) {
+                                handler.setYCol(i);
+                            }
+                        }                                               
+                                    }
+                    if (!coordinate) {
+                        if (!fields[i].isEmpty()) {
+                            nodes.values().iterator().next().put(header[i], fields[i]);
+                        }
+                    }
                                 } catch (ParseException e) {
                                         System.err.println("Warning: Parsing error on line "+lineNumber+": "+e.getMessage());

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/AbstractModule.java ¶

@@ -134 +134 @@
                                         result.add(handlerClass.newInstance());
                                 } catch (Throwable t) {
-                                        System.err.println(t.getClass().getName()+": "+t.getMessage());
+                                        System.err.println("Cannot instantiate "+handlerClass+" because of "+t.getClass().getName()+": "+t.getMessage());
                                 }
                         }