Changeset 7786 in josm for trunk/src

Timestamp:

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

Author:

Don-vip

Message:

see #10816 - fix text parsing regressions

File:

• trunk/src/org/openstreetmap/josm/tools/TextTagParser.java (modified) (2 diffs)

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;