Changeset 35586 in osm for applications/editors/josm

Timestamp:

2020-10-15T21:28:47+02:00 (4 years ago)

Author:

simon04

Message:

fix #19458 - Level0LParser: fix parsing of Unicode characters

Location:

applications/editors/josm/plugins/comfort0

Files:

• src/net/simon04/comfort0/level0l/Level0LParser.jj (modified) (2 diffs)
• test/data/example.osm (modified) (1 diff)
• test/unit/net/simon04/comfort0/OsmToLevel0LTest.java (modified) (1 diff)
• test/unit/net/simon04/comfort0/level0l/parsergen/Level0LParserTest.java (modified) (4 diffs)

applications/editors/josm/plugins/comfort0/src/net/simon04/comfort0/level0l/Level0LParser.jj

@@ -33 +33 @@
 
 <COMMENT>
-SKIP: { < ~["\n", "\r"] > }
+SKIP: { < ["\u0020"-"\uffff"] > }
 
 <COMMENT>
@@ -43 +43 @@
 TOKEN: {
     <V_EOL: ("\n" | "\r" | "\r\n") > : DEFAULT
-    | <TEXT: (~["\n", "\r"])+ >
+    | <TEXT: (["\u0020"-"\uffff"])+ >
 }
 

applications/editors/josm/plugins/comfort0/test/data/example.osm

@@ -25 +25 @@
     <!--...-->
     <member type="node" ref="249673494" role=""/>
-    <tag k="name" v="Küstenbus Linie 123"/>
+    <tag k="name" v="Küstenbus Linie 123–124"/>
     <tag k="network" v="VVW"/>
     <tag k="operator" v="Regionalverkehr Küste"/>

applications/editors/josm/plugins/comfort0/test/unit/net/simon04/comfort0/OsmToLevel0LTest.java

@@ -61 +61 @@
                     "  nd 261728686 #261728686 (54.0906309, 12.2441924)\n" +
                     "\n" +
-                    "relation 56688 #route (\"Küstenbus Linie 123\", 4 members, incomplete)\n" +
-                    "  name = Küstenbus Linie 123\n" +
+                    "relation 56688 #route (\"Küstenbus Linie 123–124\", 4 members, incomplete)\n" +
+                    "  name = Küstenbus Linie 123–124\n" +
                     "  network = VVW\n" +
                     "  operator = Regionalverkehr Küste\n" +

applications/editors/josm/plugins/comfort0/test/unit/net/simon04/comfort0/level0l/parsergen/Level0LParserTest.java

@@ -8 +8 @@
 import java.util.List;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.junit.Rule;
 import org.junit.Test;
 import org.openstreetmap.josm.data.osm.NodeData;
@@ -14 +16 @@
 import org.openstreetmap.josm.data.osm.RelationData;
 import org.openstreetmap.josm.data.osm.WayData;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 public class Level0LParserTest {
+
+    /**
+     * Setup rule
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences();
+
     @Test
     public void testNode() throws Exception {
@@ -59 +70 @@
                 "  wy 4579143 forward\n" +
                 "  nd 249673494 stop # the end\n" +
-                "  name = Küstenbus Linie 123\n" +
+                "  name = Küstenbus Linie 123–124\n" +
                 "  network = VVW\n" +
                 "  operator = Regionalverkehr Küste\n" +
@@ -67 +78 @@
         final RelationData relation = new Level0LParser(new StringReader(level0l)).relation();
         assertThat(relation.getId(), is(56688L));
+        assertThat(relation.getName(), is("Küstenbus Linie 123–124"));
         assertThat(relation.getMembersCount(), is(4));
         assertThat(relation.getMembers().get(0).getMemberId(), is(294942404L));