Changeset 197 in josm

Timestamp:

2007-01-14T05:00:46+01:00 (18 years ago)

Author:

imi

Message:

• fixed a bug in merging code (hopefully the same that causes the exception in conflict dialog)

Files:

• src/org/openstreetmap/josm/actions/search/QuickSearchAction.java (deleted)
• src/org/openstreetmap/josm/data/ServerSidePreferences.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) (1 diff)
• test/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) (3 diffs)

src/org/openstreetmap/josm/data/ServerSidePreferences.java

@@ -99 +99 @@
          * Do nothing on load. Preferences are loaded with download().
          */
-        @Override public void load() throws IOException {
+        @Override public void load() {
         }
 

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

@@ -82 +82 @@
          */
         public void visit(Segment other) {
-                if (other.incomplete)
-                        return; // won't merge in an incomplete line segment!
-                
                 if (mergeAfterId(mergedSegments, ds.segments, other))
                         return;

test/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java

@@ -1 +1 @@
 package org.openstreetmap.josm.data.osm.visitor;
 
+import java.util.Arrays;
 import java.util.Date;
 
@@ -41 +42 @@
     }
 
+        private Way createWay(long id, Date timestamp, Segment... segments) {
+                Way w = new Way();
+                w.id = id;
+                w.segments.addAll(Arrays.asList(segments));
+                w.timestamp = timestamp;
+                return w;
+        }
 
         /**
@@ -307 +315 @@
         }
         
+        public void testMergeIncompleteSegmentsAddToDataSet() throws Exception {
+                DataSet ds = new DataSet();
+                MergeVisitor v = new MergeVisitor(ds);
+                v.visit(createSegment(null, true, false, 1));
+                assertEquals(1, ds.segments.size());
+    }
+        
 }