Changeset 30574 in osm for applications/editors/josm

Timestamp:

2014-08-07T02:42:46+02:00 (10 years ago)

Author:

donvip

Message:

[josm_opendata] MIF: add new test cases and fix another bug

Location:

applications/editors/josm/plugins/opendata

Files:

• src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifReader.java (modified) (2 diffs)
• test/data/datasets/fr.datagouv/FR_DOM_Mayotte_mif_WGS84.zip (added)
• test/data/datasets/fr.datagouv/GEOFLADept_FR_Corse_MI_L93.zip (added)

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

@@ -358 +358 @@
     }
     
+    private void startPolyLine() throws IOException {
+        polyline = new Way();
+        ds.addPrimitive(polyline);
+        readAttributes(polyline);
+        state = State.READING_POINTS;
+    }
+    
     private void parsePLine(String[] words) throws IOException {
-        if (words.length > 2) {
+        if (words.length <= 1 || "MULTIPLE".equalsIgnoreCase(words[1])) {
             // TODO: pline with multiple sections
-            polyline = new Way();
-            ds.addPrimitive(polyline);
-            readAttributes(polyline);
-            numpts = Integer.parseInt(words[1]); // Not described in PDF but found in real files: PLINE XX, with XX = numpoints
-            state = State.READING_POINTS;
-        } else {
             numpts = -1;
             state = State.START_POLYLINE;
+        } else {
+            numpts = Integer.parseInt(words[1]); // Not described in PDF but found in real files: PLINE XX, with XX = numpoints
+            startPolyLine();
         }
     }
@@ -458 +462 @@
             } else if (state == State.START_POLYLINE) {
                 numpts = Integer.parseInt(words[0]);
-                polyline = new Way();
-                ds.addPrimitive(polyline);
-                readAttributes(polyline);
-                state = State.READING_POINTS;
+                startPolyLine();
                 
             } else if (state == State.READING_POINTS && numpts > 0) {