Changeset 7786 in josm for trunk

Timestamp:

2014-12-10T23:36:01+01:00 (10 years ago)

Author:

Don-vip

Message:

see #10816 - fix text parsing regressions

Location:

trunk

Files:

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

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

@@ -204 +204 @@
         // 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;
@@ -213 +213 @@
         // a = "b=c" is OK
         // a = b=c  - this method of parsing fails intentionally
-        tags = readTagsByRegexp(buf, "[\\n\\t\\r]+", "([a-zA-Z0-9:_]+)=(.*?)", true);
+        tags = readTagsByRegexp(buf, "[\\n\\t\\r]+", "(.*?)=(.*?)", true);
                 // try format  t1=v1\n t2=v2\n ...
         if (tags!=null) return tags;

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

@@ -39 +39 @@
     @Test
     public void testTNformat() {
-        String txt = "   a  \t  1   \n\n\n  b=2 \t the value with \"quotes\"";
+        String txt = "   a  \t  1   \n\n\n  b\t2 \n c \t the value with \"quotes\"";
         Map<String, String> correctTags = new HashMap<String, String>() { {
-            put("a", "1"); put("b=2", "the value with \"quotes\"");
+            put("a", "1"); put("b", "2"); put("c", "the value with \"quotes\"");
         }};
         Map<String, String> tags = TextTagParser.readTagsFromText(txt);