Changeset 224 in josm

Timestamp:

2007-05-05T23:33:16+02:00 (18 years ago)

Author:

framm

Message:

Fixed MergeVisitor so that it will never merge between objects that are
part of the group of objects being added - only between pre-existing
objects and those being added.

Files:

• src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) (6 diffs)
• src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/IncompleteDownloader.java (modified) (1 diff)
• test/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) (8 diffs)

src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java

@@ -48 +48 @@
 
                 @Override protected void finish() {
-                        MergeVisitor merger = new MergeVisitor(Main.ds);
+                        MergeVisitor merger = new MergeVisitor(Main.ds, reader.data);
                         for (OsmPrimitive osm : reader.data.allPrimitives())
                                 osm.visit(merger);

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

@@ -29 +29 @@
 
         private final DataSet ds;
+        private final DataSet mergeds;
 
         /**
@@ -43 +44 @@
         private final Map<Segment, Segment> mergedSegments = new HashMap<Segment, Segment>();
 
-        public MergeVisitor(DataSet ds) {
+        public MergeVisitor(DataSet ds, DataSet mergeds) {
                 this.ds = ds;
+                this.mergeds = mergeds;
         }
 
@@ -57 +59 @@
                 Node my = null;
                 for (Node n : ds.nodes) {
-                        if (match(n, other)) {
+                        if (match(n, other) && ((mergeds == null) || (!mergeds.nodes.contains(n)))) {
                                 my = n;
                                 break;
@@ -87 +89 @@
                 Segment my = null;
                 for (Segment ls : ds.segments) {
-                        if (match(other, ls)) {
+                        if (match(other, ls) && ((mergeds == null) || (!mergeds.segments.contains(ls)))) {
                                 my = ls;
                                 break;
                         }
                 }
+                
                 if (my == null)
                         ds.segments.add(other);
@@ -145 +148 @@
                 Way my = null;
                 for (Way w : ds.ways) {
-                        if (match(other, w)) {
+                        if (match(other, w) && ((mergeds == null) || (!mergeds.ways.contains(w)))) {
                                 my = w;
                                 break;
@@ -291 +294 @@
                 else
                         my.keys.putAll(other.keys);
+                
                 my.modified = true;
         }

src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -157 +157 @@
 
         @Override public void mergeFrom(final Layer from) {
-                final MergeVisitor visitor = new MergeVisitor(data);
+                final MergeVisitor visitor = new MergeVisitor(data,((OsmDataLayer)from).data);
                 for (final OsmPrimitive osm : ((OsmDataLayer)from).data.allPrimitives())
                         osm.visit(visitor);

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

@@ -44 +44 @@
          */
         private final Collection<Way> toDownload;
-        private MergeVisitor merger = new MergeVisitor(data);
+        private MergeVisitor merger = new MergeVisitor(data, null);
 
         public IncompleteDownloader(Collection<Way> toDownload) {

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

@@ -25 +25 @@
                 ds = new DataSet();
                 dsNode = DataSetTestCaseHelper.createNode(ds);
-                v = new MergeVisitor(ds);
+                v = new MergeVisitor(ds, null);
                 n = DataSetTestCaseHelper.createNode(null);
         }
@@ -235 +235 @@
 
                 Segment ls2 = DataSetTestCaseHelper.createSegment(ds, n2[0], n2[1]);
-                v = new MergeVisitor(ds);
+                v = new MergeVisitor(ds, null);
                 for (OsmPrimitive osm : ds2.allPrimitives())
                         osm.visit(v);
@@ -249 +249 @@
                 Segment s = DataSetTestCaseHelper.createSegment(ds, n[0], n[1]);
                 Way w = DataSetTestCaseHelper.createWay(ds, s);
-                MergeVisitor v = new MergeVisitor(ds);
+                MergeVisitor v = new MergeVisitor(ds, null);
                 v.visit(n[0]);
                 v.visit(n[1]);
@@ -281 +281 @@
                 w.id = 42;
                 // merge both
-                MergeVisitor v = new MergeVisitor(ds);
+                MergeVisitor v = new MergeVisitor(ds, null);
                 v.visit(w);
                 v.fixReferences();
@@ -299 +299 @@
                 s.timestamp = new Date(new Date().getTime()+1);
                 
-                MergeVisitor v = new MergeVisitor(ds);
+                MergeVisitor v = new MergeVisitor(ds, null);
                 v.visit(s);
                 v.fixReferences();
@@ -308 +308 @@
         public void testMergeIncompleteSegmentsAddToDataSet() throws Exception {
                 DataSet ds = new DataSet();
-                MergeVisitor v = new MergeVisitor(ds);
+                MergeVisitor v = new MergeVisitor(ds, null);
                 v.visit(createSegment(null, true, false, 1));
                 assertEquals(1, ds.segments.size());
@@ -330 +330 @@
                 newNode.timestamp = new Date(date.getTime());
                 
-                MergeVisitor v = new MergeVisitor(ds);
+                MergeVisitor v = new MergeVisitor(ds, null);
                 v.visit(newNode);
 
@@ -343 +343 @@
                 Segment s2 = new Segment(42);
                 
-                MergeVisitor v = new MergeVisitor(ds);
+                MergeVisitor v = new MergeVisitor(ds, null);
                 v.visit(s1);
                 v.visit(s2);