Changeset 60 in josm for src/org/openstreetmap/josm/data

Timestamp:

2006-03-14T17:41:14+01:00 (18 years ago)

Author:

imi

Message:

• fixed load of action attribute (preserve changes)
• fixed exception when merging ways with different number of segments

File:

• src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) (1 diff)

src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java

@@ -188 +188 @@
         private boolean match(Track t1, Track t2) {
                 if (t1.id == 0 || t2.id == 0) {
+                        if (t1.segments.size() != t2.segments.size())
+                                return false;
                         Iterator<LineSegment> it = t1.segments.iterator();
                         for (LineSegment ls : t2.segments)