Changeset 336 in josm for branch

Timestamp:

2007-10-02T23:23:09+02:00 (17 years ago)

Author:

framm

Message:

• added patch from Ted Mielczarek <ted.mielczarek@…> to handle <link> tags in GPX nodes

File:

• branch/0.5/src/org/openstreetmap/josm/io/RawGpsReader.java (modified) (2 diffs)

branch/0.5/src/org/openstreetmap/josm/io/RawGpsReader.java

@@ -94 +94 @@
                                 }
                                 tags.push(tag);
-                        }
+                        } else if (peek.equals("text")) {
+                            String tag = tags.pop();
+                            if (tags.empty() || !tags.peek().equals("link")) {
+                                tags.push(tag);
+                                return;
+                            }
+                            String contents = new String(ch, start, length);
+                            // we just want the contents of <link><text></text></link> to
+                            // all be stored under link.
+                            String oldContents = currentTagValues.get("link");
+                            if (oldContents == null) {
+                                currentTagValues.put("link", contents);
+                            } else {
+                                currentTagValues.put("link", oldContents + contents);
+                            }
+                            tags.push(tag);
+                        }
                 }
 
@@ -109 +125 @@
                                 newTrack();
                                 currentTagValues.clear();
-                        }
+                        } else if (qName.equals("link")) {
+                            String contents = currentTagValues.get(qName);
+                            if (contents != null) {
+                                // strip off leading and trailing whitespace
+                                currentTagValues.put(qName,
+                                                     contents
+                                                      .replaceFirst("^\\s+", "")
+                                                      .replaceFirst("\\s+$", ""));
+                            }
+                        }
                         tags.pop();
                 }