CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-19 23:14:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixup after merge

Browse Source
This commit is contained in:
John Firebaugh
2013-05-28 16:56:49 -07:00
parent 1e8052182d
commit 56f8b9e4a9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/id/actions/merge_polygon.js
+1 -1
View File
@@ -1,7 +1,7 @@
iD.actions.MergePolygon = function(ids, newRelationId) {
function groupEntities(graph) {
var entities = ids.map(graph.getEntity);
var entities = ids.map(function (id) { return graph.entity(id); });
return _.extend({
closedWay: [],
multipolygon: [],
test/spec/actions/merge_polygon.js
+2 -2
View File
@@ -54,7 +54,7 @@ describe("iD.actions.MergePolygon", 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.geometry(graph)).to.equal('area');
expect(r.isMultipolygon()).to.equal(true);
expect(r.members.length).to.equal(2);
expect(find(r, 'w0').role).to.equal('outer');
@@ -76,7 +76,7 @@ describe("iD.actions.MergePolygon", function () {
graph = iD.actions.MergePolygon(['r', 'r2'])(graph);
// Delete other relation
expect(graph.entity('r2')).to.equal(undefined);
expect(graph.hasEntity('r2')).to.equal(undefined);
var r = graph.entity('r');
expect(find(r, 'w0').role).to.equal('outer');