Changeset 8482 in josm for trunk

Timestamp:

2015-06-10T21:00:48+02:00 (9 years ago)

Author:

simon04

Message:

Correctly parse tab-separated tags

… by using non-greedy regular expression for prefix to ignore

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/TextTagParser.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/tools/TextTagParserTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/TextTagParser.java

@@ -203 +203 @@
         // Format
         // tag1\tval1\ntag2\tval2\n
-        tags = readTagsByRegexp(buf, "[\\r\\n]+", ".*([a-zA-Z0-9:_]+).*\\t(.*?)", false);
+        tags = readTagsByRegexp(buf, "[\\r\\n]+", ".*?([a-zA-Z0-9:_]+).*\\t(.*?)", false);
                 // try "tag\tvalue\n" format
         if (tags!=null) return tags;

trunk/test/unit/org/openstreetmap/josm/tools/TextTagParserTest.java

@@ -95 +95 @@
 
     }
+
+    @Test
+    public void testTab() throws Exception {
+        Assert.assertEquals(TextTagParser.readTagsFromText("shop\tjewelry"), Collections.singletonMap("shop", "jewelry"));
+        Assert.assertEquals(TextTagParser.readTagsFromText("!shop\tjewelry"), Collections.singletonMap("shop", "jewelry"));
+        Assert.assertEquals(TextTagParser.readTagsFromText("!!!shop\tjewelry"), Collections.singletonMap("shop", "jewelry"));
+        Assert.assertEquals(TextTagParser.readTagsFromText("shop\t\t\tjewelry"), Collections.singletonMap("shop", "jewelry"));
+    }
 }