Changeset 32898 in osm

Timestamp:

2016-09-02T21:32:04+02:00 (9 years ago)

Author:

donvip

Message:

fix #josm13508 - support CSV format with lat/lon couple in a single column named "Geo Point"

Location:

applications/editors/josm/plugins/opendata

Files:

• src/org/openstreetmap/josm/plugins/opendata/core/OdConstants.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/opendata/core/io/ProjectionPatterns.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/SpreadSheetReader.java (modified) (5 diffs)
• test/data/regress/13508 (added)
• test/data/regress/13508/arrets-de-bus0.csv (added)
• test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/CsvReaderTest.java (modified) (1 diff)

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

@@ -102 +102 @@
     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 XY_STRING = "POINT";
 
     // The list of all ProjectionPatterns (filled at each constructor call)
@@ -107 +108 @@
 
     // CHECKSTYLE.OFF: LineLength
-    public static final ProjectionPatterns PRJ_WGS84 = new ProjectionPatterns("GPS|WGS84|°décimaux", Projections.getProjectionByCode("EPSG:4326"));
+    public static final ProjectionPatterns PRJ_WGS84 = new ProjectionPatterns("GPS|WGS84|°décimaux|GEO", Projections.getProjectionByCode("EPSG:4326"));
     public static final ProjectionPatterns PRJ_LAMBERT_93 = new ProjectionPatterns("LAMB93|L93", Projections.getProjectionByCode("EPSG:2154"));
     public static final ProjectionPatterns PRJ_LAMBERT_CC_9_ZONES = new LambertCC9ZonesProjectionPatterns("LAMBZ|CC(42|43|44|45|46|47|48|49|50)");

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

@@ -11 +11 @@
     private final Pattern xPattern;
     private final Pattern yPattern;
+    private final Pattern xyPattern;
     private final Projection projection;
-    
-    public ProjectionPatterns(Pattern xPattern, Pattern yPattern, Projection projection) {
+
+    public ProjectionPatterns(Pattern xPattern, Pattern yPattern, Pattern xyPattern, Projection projection) {
         this.xPattern = xPattern;
         this.yPattern = yPattern;
+        this.xyPattern = xyPattern;
         this.projection = projection;
         OdConstants.PROJECTIONS.add(this);
     }
 
-    public ProjectionPatterns(Pattern xPattern, Pattern yPattern) {
-        this(xPattern, yPattern, null);
-    }
-
     public ProjectionPatterns(String proj, Projection projection) {
-        this(getCoordinatePattern(OdConstants.X_STRING, proj), getCoordinatePattern(OdConstants.Y_STRING, proj), projection);
+        this(getCoordinatePattern(OdConstants.X_STRING, proj),
+             getCoordinatePattern(OdConstants.Y_STRING, proj),
+             getCoordinatePattern(OdConstants.XY_STRING, proj), projection);
     }
 
     public ProjectionPatterns(String proj) {
-        this(getCoordinatePattern(OdConstants.X_STRING, proj), getCoordinatePattern(OdConstants.Y_STRING, proj), null);
+        this(proj, null);
     }
-    
+
     public final Pattern getXPattern() {
         return xPattern;
     }
-    
+
     public final Pattern getYPattern() {
         return yPattern;
+    }
+
+    public final Pattern getXYPattern() {
+        return xyPattern;
     }
 
@@ -58 +62 @@
     @Override
     public String toString() {
-        return "[xPattern=" + xPattern + ", yPattern=" + yPattern + ", projection=" + projection + "]";
+        return "[xPattern=" + xPattern + ", yPattern=" + yPattern + ", xyPattern=" + xyPattern + ", projection=" + projection + ']';
     }
 }

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

@@ -15 +15 @@
 import java.util.Locale;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.openstreetmap.josm.Main;
@@ -32 +34 @@
     private static final NumberFormat formatUK = NumberFormat.getInstance(Locale.UK);
 
+    private static final String COOR = "(\\-?\\d+(?:[\\.,]\\d+)?)";
+    private static final Pattern LATLON_PATTERN = Pattern.compile("^"+COOR+"[,;]?\\s*"+COOR+"$");
+
     protected final SpreadSheetHandler handler;
 
@@ -68 +73 @@
         @Override
         public String toString() {
-            return "CoordinateColumns [proj=" + proj + ", xCol=" + xCol + ", yCol=" + yCol + "]";
+            return "CoordinateColumns [proj=" + proj + ", xCol=" + xCol + ", yCol=" + yCol + ']';
         }
     }
@@ -91 +96 @@
                 }
                 CoordinateColumns col = columns.isEmpty() ? null : columns.get(columns.size()-1);
-                if (pp.getXPattern().matcher(header[i]).matches()) {
+                if (pp.getXYPattern().matcher(header[i]).matches()) {
+                    CoordinateColumns coorCol = addCoorColIfNeeded(columns, col);
+                    coorCol.xCol = i;
+                    coorCol.yCol = i;
+                    break;
+                } else if (pp.getXPattern().matcher(header[i]).matches()) {
                     addCoorColIfNeeded(columns, col).xCol = i;
                     break;
@@ -184 +194 @@
                     for (CoordinateColumns c : columns) {
                         EastNorth en = ens.get(c);
-                        if (i == c.xCol) {
+                        if (i == c.xCol && i == c.yCol) {
+                            Matcher m = LATLON_PATTERN.matcher(fields[i]);
+                            if (m.matches()) {
+                                coordinate = true;
+                                ens.put(c, new EastNorth(parseDouble(m.group(2)), parseDouble(m.group(1))));
+                                if (handler != null) {
+                                    handler.setXCol(i);
+                                    handler.setYCol(i);
+                                }
+                            }
+                        } else if (i == c.xCol) {
                             coordinate = true;
                             ens.put(c, new EastNorth(parseDouble(fields[i]), en.north()));

applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/CsvReaderTest.java

@@ -56 +56 @@
 
     /**
+     * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/13508">#13508</a>
+     * @throws IOException if an error occurs during reading
+     */
+    @Test
+    public void testTicket13508() throws IOException, XMLStreamException, FactoryConfigurationError {
+        try (InputStream is = TestUtils.getRegressionDataStream(13508, "arrets-de-bus0.csv")) {
+            NonRegFunctionalTests.testGeneric("#13508", CsvReader.parseDataSet(is, newHandler("EPSG:4326"), null));
+        }
+    }
+
+    /**
      * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/10214">#10214</a>
      * @throws IOException if an error occurs during reading