Changeset 35102 in osm for applications/editors/josm/plugins

Timestamp:

2019-08-24T13:22:56+02:00 (5 years ago)

Author:

donvip

Message:

fix #josm18029 - handling of tabular files where lat/lon column ends with "_lat" / "_lon"

Location:

applications/editors/josm/plugins/opendata

Files:

• src/org/openstreetmap/josm/plugins/opendata/core/OdConstants.java (modified) (1 diff)
• test/data/regress/18029 (added)
• test/data/regress/18029/gtfs_stops.broken.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

@@ -100 +100 @@
      * 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|.*_LON|LONGI|.*LONGITUDE.*|EASTING";
+    public static final String Y_STRING = "Y|LAT|.*_LAT|LATI|.*LATITUDE.*|NORTHING";
     public static final String XY_STRING = "POINT";
 

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

@@ -52 +52 @@
 
     /**
+     * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/18029">#18029</a>
+     * @throws Exception if an error occurs during reading
+     */
+    @Test
+    public void testTicket18029() throws Exception {
+        try (InputStream is = TestUtils.getRegressionDataStream(18029, "gtfs_stops.broken.csv")) {
+            NonRegFunctionalTests.testGeneric("#18029", CsvReader.parseDataSet(is, newHandler("EPSG:4326"), null));
+        }
+    }
+
+    /**
      * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/13508">#13508</a>
      * @throws Exception if an error occurs during reading