CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-15 21:48:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add unit test for single-member multipolygon collapse behavior exception for conflicting tags in actionJoin (re: f7d8c51bd3)

Browse Source
This commit is contained in:
Quincy Morgan
2019-11-21 12:54:59 -05:00
parent 588fa36a3a
commit 95a14ea722
1 changed files with 49 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/actions/join.js
+49 -6
View File
@@ -562,21 +562,64 @@ describe('iD.actionJoin', function () {
iD.osmNode({id: 'd', loc: [2,0]}),
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd']}),
iD.osmWay({id: '=', nodes: ['d', 'a']}),
iD.osmRelation({id: 'm', tags: {
type: 'multipolygon',
building: 'yes'
}, members: [
iD.osmRelation({id: 'm', members: [
{id: '-', role: 'outer', type: 'way'},
{id: '=', role: 'outer', type: 'way'}
]})
], tags: {
type: 'multipolygon',
man_made: 'pier'
}})
]);
graph = iD.actionJoin(['-', '='])(graph);
expect(graph.entity('-').nodes).to.eql(['a', 'b', 'c', 'd', 'a']);
expect(graph.entity('-').tags.building).to.eql('yes');
expect(graph.entity('-').tags).to.eql({ man_made: 'pier', area: 'yes' });
expect(graph.hasEntity('=')).to.be.undefined;
expect(graph.hasEntity('m')).to.be.undefined;
});
it('does not collapse resultant single-member multipolygon into basic area when tags conflict', function () {
// Situation:
// b --> c
// |#####|
// |# m #|
// |#####|
// a <== d
//
// Expected result:
// a --> b
// |#####|
// |# m #|
// |#####|
// d <-- c
var graph = iD.coreGraph([
iD.osmNode({id: 'a', loc: [0,0]}),
iD.osmNode({id: 'b', loc: [0,2]}),
iD.osmNode({id: 'c', loc: [2,2]}),
iD.osmNode({id: 'd', loc: [2,0]}),
iD.osmWay({id: '-', nodes: ['a', 'b', 'c', 'd'], tags: { surface: 'paved' }}),
iD.osmWay({id: '=', nodes: ['d', 'a']}),
iD.osmRelation({id: 'm', members: [
{id: '-', role: 'outer', type: 'way'},
{id: '=', role: 'outer', type: 'way'}
], tags: {
type: 'multipolygon',
man_made: 'pier',
surface: 'wood'
}})
]);
graph = iD.actionJoin(['-', '='])(graph);
expect(graph.entity('-').nodes).to.eql(['a', 'b', 'c', 'd', 'a']);
expect(graph.entity('-').tags).to.eql({ surface: 'paved' });
expect(graph.hasEntity('=')).to.be.undefined;
expect(graph.hasEntity('m').tags).to.eql({
type: 'multipolygon',
man_made: 'pier',
surface: 'wood'
});
});
});