add multipolygon creation tests

js/id/actions/merge_polygon.js

@@ -1,4 +1,4 @@
-iD.actions.MergePolygon = function(ids) {
+iD.actions.MergePolygon = function(ids, newRelationId) {
 
     function groupEntities(graph) {
         var entities = ids.map(graph.getEntity);
@@ -53,7 +53,7 @@ iD.actions.MergePolygon = function(ids) {
         });
 
         // Sort all polygons as either outer or inner ways
-        var members = [];
+        var members = [],
             outer = true;
 
         while (polygons.length) {
@@ -87,7 +87,7 @@ iD.actions.MergePolygon = function(ids) {
 
         // Move all tags to one relation
         var relation = entities.multipolygon[0] ||
-            iD.Relation({ tags: { type: 'multipolygon' }});
+            iD.Relation({ id: newRelationId, tags: { type: 'multipolygon' }});
 
         entities.multipolygon.slice(1).forEach(function(m) {
             relation = relation.mergeTags(m.tags);
@@ -100,9 +100,10 @@ iD.actions.MergePolygon = function(ids) {
             graph = graph.replace(entity.update({ tags: {} }));
         });
 
-        delete relation.tags.area;
-
-        return graph.replace(relation.update({ members: members }));
+        return graph.replace(relation.update({
+            members: members,
+            tags: _.omit(relation.tags, 'area')
+        }));
     };
 
     action.disabled = function(graph) {

test/spec/actions/merge_polygon.js

@@ -0,0 +1,137 @@
+describe("iD.actions.MergePolygon", function () {
+    
+    function node(id, x, y) {
+        e[id] = iD.Node({ id: id, loc: [x, y] });
+    }
+
+    function way(id, nodes) {
+        e[id] = iD.Way({ id: id, nodes: nodes.map(function(n) { return 'n' + n; }) });
+    }
+
+    var e = {};
+
+    node('n0', 0, 0);
+    node('n1', 5, 0);
+    node('n2', 5, 5);
+    node('n3', 0, 5);
+
+    node('n4', 1, 1);
+    node('n5', 4, 1);
+    node('n6', 4, 4);
+    node('n7', 1, 4);
+
+    node('n8', 2, 2);
+    node('n9', 3, 2);
+    node('n10', 3, 3);
+    node('n11', 2, 3);
+
+    node('n13', 8, 8);
+    node('n14', 8, 9);
+    node('n15', 9, 9);
+
+    way('w0', [0, 1, 2, 3, 0]);
+    way('w1', [4, 5, 6, 7, 4]);
+    way('w2', [8, 9, 10, 11, 8]);
+
+    way('w3', [4, 5, 6]);
+    way('w4', [6, 7, 4]);
+
+    way('w5', [13, 14, 15, 13]);
+
+    var graph;
+
+    beforeEach(function() {
+        graph = iD.Graph(e);
+    });
+
+    function find(relation, id) {
+        return _.find(relation.members, function(d) {
+            return d.id === id;
+        });
+    }
+
+    it("creates a multipolygon from two closed ways", function() {
+        graph = iD.actions.MergePolygon(['w0', 'w1'], 'r')(graph);
+        var r = graph.entity('r');
+        expect(!!r).to.equal(true);
+        expect(r.geometry()).to.equal('area');
+        expect(r.isMultipolygon()).to.equal(true);
+        expect(r.members.length).to.equal(2);
+        expect(find(r, 'w0').role).to.equal('outer');
+        expect(find(r, 'w0').type).to.equal('way');
+        expect(find(r, 'w1').role).to.equal('inner');
+        expect(find(r, 'w1').type).to.equal('way');
+    });
+
+    it("creates a multipolygon from a closed way and a multipolygon relation", function() {
+        graph = iD.actions.MergePolygon(['w0', 'w1'], 'r')(graph);
+        graph = iD.actions.MergePolygon(['r', 'w2'])(graph);
+        var r = graph.entity('r');
+        expect(r.members.length).to.equal(3);
+    });
+
+    it("creates a multipolygon from two multipolygon relations", function() {
+        graph = iD.actions.MergePolygon(['w0', 'w1'], 'r')(graph);
+        graph = iD.actions.MergePolygon(['w2', 'w5'], 'r2')(graph);
+        graph = iD.actions.MergePolygon(['r', 'r2'])(graph);
+        
+        // Delete other relation
+        expect(graph.entity('r2')).to.equal(undefined);
+
+        var r = graph.entity('r');
+        expect(find(r, 'w0').role).to.equal('outer');
+        expect(find(r, 'w1').role).to.equal('inner');
+        expect(find(r, 'w2').role).to.equal('outer');
+        expect(find(r, 'w5').role).to.equal('outer');
+    });
+
+    it("moves all tags to the relation", function() {
+        graph = graph.replace(e.w0.update({ tags: { 'building': 'yes' }}));
+        graph = graph.replace(e.w1.update({ tags: { 'natural': 'water' }}));
+        graph = iD.actions.MergePolygon(['w0', 'w1'], 'r')(graph);
+        var r = graph.entity('r');
+        expect(graph.entity('w0').tags.building).to.equal(undefined);
+        expect(graph.entity('w1').tags.natural).to.equal(undefined);
+        expect(r.tags.natural).to.equal('water');
+        expect(r.tags.building).to.equal('yes');
+    });
+
+    it("doesn't copy area tags from ways", function() {
+        graph = graph.replace(e.w0.update({ tags: { 'area': 'yes' }}));
+        graph = iD.actions.MergePolygon(['w0', 'w1'], 'r')(graph);
+        var r = graph.entity('r');
+        expect(r.tags.area).to.equal(undefined);
+    });
+
+    it("creates a multipolygon with two disjunct outer rings", function() {
+        graph = iD.actions.MergePolygon(['w0', 'w5'], 'r')(graph);
+        var r = graph.entity('r');
+        expect(find(r, 'w0').role).to.equal('outer');
+        expect(find(r, 'w5').role).to.equal('outer');
+    });
+
+    it("creates a multipolygon with an island in a hole", function() {
+        graph = iD.actions.MergePolygon(['w0', 'w1'], 'r')(graph);
+        graph = iD.actions.MergePolygon(['r', 'w2'])(graph);
+        var r = graph.entity('r');
+        expect(find(r, 'w0').role).to.equal('outer');
+        expect(find(r, 'w1').role).to.equal('inner');
+        expect(find(r, 'w2').role).to.equal('outer');
+    });
+
+    it("extends a multipolygon with multi-way rings", function() {
+        console.log('start');
+        var r = iD.Relation({ id: 'r', tags: { type: 'multipolygon' }, members: [
+            { type: 'way', role: 'outer', id: 'w0' },
+            { type: 'way', role: 'inner', id: 'w3' },
+            { type: 'way', role: 'inner', id: 'w4' }
+        ]});
+        graph = graph.replace(r);
+        graph = iD.actions.MergePolygon(['r', 'w2'])(graph);
+        r = graph.entity('r');
+        expect(find(r, 'w0').role).to.equal('outer');
+        expect(find(r, 'w2').role).to.equal('outer');
+        expect(find(r, 'w3').role).to.equal('inner');
+        expect(find(r, 'w4').role).to.equal('inner');
+    });
+});