CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-13 01:02:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix code tests

Browse Source
This commit is contained in:
Quincy Morgan
2020-04-03 13:33:54 -07:00
parent ca1e2031e7
commit 513b344012
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/validations/crossing_ways.js
View File

@@ -302,7 +302,7 @@ export function validationCrossingWays(context) {
(!member.role || member.role === 'outer' || member.role === 'inner')) {
var entity = graph.hasEntity(member.id);
// don't add duplicates
if (!entity || array.includes(entity)) return;
if (!entity || array.indexOf(entity) !== -1) return;
array.push(entity);
}
return array;

14
test/spec/validations/crossing_ways.js
View File

@@ -65,6 +65,9 @@ describe('iD.validations.crossing_ways', function () {
}
function verifySingleCrossingIssue(issues) {
// each entity must produce an identical issue
expect(issues).to.have.lengthOf(2);
var issue = issues[0];
expect(issue.type).to.eql('crossing_ways');
expect(issue.entityIds).to.have.lengthOf(2);
@@ -256,7 +259,7 @@ describe('iD.validations.crossing_ways', function () {
var n6 = iD.osmNode({id: 'n-6', loc: [2,3]});
var w2 = iD.osmWay({id: 'w-2', nodes: ['n-3', 'n-4', 'n-5'], tags: {}});
var w3 = iD.osmWay({id: 'w-3', nodes: ['n-5', 'n-6', 'n-3'], tags: {}});
var r1 = iD.osmRelation({id: 'r-1', members: [{id: 'w-2'}, {id: 'w-3'}], tags: relTags});
var r1 = iD.osmRelation({id: 'r-1', members: [{id: 'w-2', type: 'way'}, {id: 'w-3', type: 'way'}], tags: relTags});
context.perform(
iD.actionAddEntity(n3),
@@ -269,8 +272,13 @@ describe('iD.validations.crossing_ways', function () {
);
}
it('one cross point between highway and building relation', function() {
createWayAndRelationWithOneCrossingPoint({ highway: 'residential' }, { building: 'yes' });
it('one cross point between highway line and building multipolygon relation', function() {
createWayAndRelationWithOneCrossingPoint({ highway: 'residential' }, { building: 'yes', type: 'multipolygon' });
verifySingleCrossingIssue(validate(), 'r-1');
});
it('one cross point between highway line and highway multipolygon relation', function() {
createWayAndRelationWithOneCrossingPoint({ highway: 'residential' }, { highway: 'footway', type: 'multipolygon' });
verifySingleCrossingIssue(validate(), 'r-1');
});