Changeset 97 in josm for src

Timestamp:

2006-04-23T23:20:33+02:00 (18 years ago)

Author:

imi

Message:

• fixed merge import of incomplete line segments

Location:

src/org/openstreetmap/josm

Files:

• data/osm/Segment.java (modified) (1 diff)
• data/osm/visitor/MergeVisitor.java (modified) (3 diffs)
• io/OsmServerReader.java (modified) (3 diffs)
• test/MergeVisitorTest.java (modified) (6 diffs)

src/org/openstreetmap/josm/data/osm/Segment.java

@@ -80 +80 @@
 
         @Override public boolean realEqual(OsmPrimitive osm) {
-                return osm instanceof Segment ? 
-                                super.realEqual(osm) && 
-                                from.equals(((Segment)osm).from) && 
-                                to.equals(((Segment)osm).to) : false;
+                if (!(osm instanceof Segment))
+                        return super.realEqual(osm); 
+                if (incomplete)
+                        return ((Segment)osm).incomplete;
+                return from.equals(((Segment)osm).from) && to.equals(((Segment)osm).to);
         }
 

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;
@@ -252 +255 @@
         }
 
+        /**
+         * @return <code>true</code>, if no merge is needed.
+         */
         private <P extends OsmPrimitive> boolean mergeAfterId(Map<P,P> merged, Collection<P> primitives, P other) {
                 for (P my : primitives) {
@@ -257 +263 @@
                                 return true; // no merge needed.
                         if (my.id == other.id) {
+                                if (my instanceof Segment && ((Segment)my).incomplete)
+                                        return false; // merge always over an incomplete
                                 Date d1 = my.timestamp == null ? new Date(0) : my.timestamp;
                                 Date d2 = other.timestamp == null ? new Date(0) : other.timestamp;

src/org/openstreetmap/josm/io/OsmServerReader.java

@@ -28 +28 @@
         private final double lat2;
         private final double lon2;
-        
+
         /**
          * Construct the reader and store the information for attaching
@@ -51 +51 @@
                         Collection<Collection<GpsPoint>> data = new LinkedList<Collection<GpsPoint>>();
                         Collection<GpsPoint> list = new LinkedList<GpsPoint>();
-                        
+
                         for (int i = 0;;++i) {
+                                currentAction.setText("Downloading points "+(i*5000)+" to "+((i+1)*5000)+"...");
                                 Reader r = getReader(url+i);
                                 if (r == null)
@@ -70 +71 @@
                                 activeConnection = null;
                         }
-        
+
                         data.add(list);
                         return data;

src/org/openstreetmap/josm/test/MergeVisitorTest.java

@@ -16 +16 @@
 public class MergeVisitorTest extends TestCase {
 
-        
+
         private DataSet ds;
         private Node dsNode;
@@ -27 +27 @@
                 v = new MergeVisitor(ds);
                 n = DataSetTestCaseHelper.createNode(null);
-    }
+        }
 
 
@@ -101 +101 @@
                 ds.segments.add(sold);
                 // have a conflicting segment point to the new node
-                Segment s = new Segment(n,n);
+                Segment s = new Segment(n,DataSetTestCaseHelper.createNode(null));
                 s.id = 23;
                 s.modified = true;
@@ -108 +108 @@
                 assertEquals(n.timestamp, dsNode.timestamp);
                 v.visit(s);
+                assertEquals(1, v.conflicts.size());
                 v.fixReferences();
                 assertSame(s.from, dsNode);
-                assertSame(s.to, dsNode);
         }
-        
+
         public void testNoConflictForSame() {
                 dsNode.id = 1;
@@ -136 +136 @@
                 assertEquals("segment should have been merged.", 1, ds.segments.size());
         }
-        
+
+        /**
+         * Incomplete segments should always loose.
+         */
+        public void testImportIncomplete() throws Exception {
+                Segment s1 = DataSetTestCaseHelper.createSegment(ds, dsNode, dsNode);
+                s1.id = 1;
+                Segment s2 = new Segment(s1);
+                s1.incomplete = true;
+                v.visit(s2);
+                assertTrue(s1.realEqual(s2));
+        }
+
+
         /**
          * Nodes beeing merged are equal but should be the same.
@@ -163 +176 @@
                 assertSame(ls1.from, ls2.from);
         }
-        
-        
+
+
         /**
          * Create that amount of nodes and add them to the dataset. The id will be 1,2,3,4...