Changeset 33049 in osm for applications/editors/josm/plugins/opendata

Timestamp:

2016-11-03T21:49:11+01:00 (8 years ago)

Author:

donvip

Message:

fix #josm13821 - fail to open spreadsheet with several possible projection columns

Location:

applications/editors/josm/plugins/opendata

Files:

• src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/SpreadSheetReader.java (modified) (3 diffs)
• test/data/regress/13821 (added)
• test/data/regress/13821/1_set_v_0.6_2016_06_21_06_00_23_a.ods (added)
• test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/OdsReaderTest.java (added)

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

@@ -35 +35 @@
 
     private static final String COOR = "(\\-?\\d+(?:[\\.,]\\d+)?)";
-    private static final Pattern LATLON_PATTERN = Pattern.compile("^"+COOR+"[,;]?\\s*"+COOR+"$");
+    // Lat/lon pattern with optional altitude and precision
+    private static final Pattern LATLON_PATTERN = Pattern.compile(
+            "^"+COOR+"[,;\\s]\\s*"+COOR+"(?:[,;\\s]\\s*"+COOR+"(?:[,;\\s]\\s*"+COOR+")?)?$");
 
     protected final SpreadSheetHandler handler;
@@ -220 +222 @@
                     if (!coordinate) {
                         if (!fields[i].isEmpty()) {
-                            nodes.values().iterator().next().put(header[i], fields[i]);
+                            for (Node n : nodes.values()) {
+                                n.put(header[i], fields[i]);
+                            }
                         }
                     }
@@ -232 +236 @@
                 EastNorth en = ens.get(c);
                 if (en.isValid()) {
-                    n.setCoor(c.proj != null && !handlerOK ? c.proj.eastNorth2latlon(en) : handler.getCoor(en, fields));
+                    n.setCoor(c.proj != null && !handlerOK ? c.proj.eastNorth2latlon(en) : handler != null ? handler.getCoor(en, fields) : null);
                 } else {
                     Main.warn("Skipping line "+lineNumber+" because no valid coordinates have been found at columns "+c);