Changeset 11243 in josm for trunk/src/org

Timestamp:

2016-11-12T20:11:06+01:00 (8 years ago)

Author:

Don-vip

Message:

see #10387 - fix unit tests

Location:

trunk/src/org/openstreetmap/josm

Files:

• command/Command.java (modified) (1 diff)
• tools/Geometry.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/command/Command.java

@@ -340 +340 @@
     @Override
     public int hashCode() {
-        return Objects.hash(cloneMap, layer);
+        return Objects.hash(cloneMap, layer, data);
     }
 

trunk/src/org/openstreetmap/josm/tools/Geometry.java

@@ -24 +24 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.BBox;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.MultipolygonBuilder;
 import org.openstreetmap.josm.data.osm.MultipolygonBuilder.JoinedPolygon;
@@ -35 +36 @@
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.Projections;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
 /**
@@ -84 +86 @@
             changedWays[pos] = false;
         }
+
+        OsmDataLayer layer = Main.getLayerManager().getEditLayer();
+        DataSet dataset = ways.iterator().next().getDataSet();
 
         //iterate over all way pairs and introduce the intersections
@@ -189 +194 @@
 
                                 if (intNode == newNode) {
-                                    cmds.add(new AddCommand(intNode));
+                                    cmds.add(layer != null ? new AddCommand(layer, intNode) : new AddCommand(dataset, intNode));
                                 }
                             }