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

Add Relation#hasFromViaTo method and tests

Browse Source
This commit is contained in:
Bryan Housel
2019-04-29 21:39:40 -04:00
parent bd2490a965
commit 2b46440429
2 changed files with 88 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/osm/relation.js
+9
View File
@@ -256,6 +256,15 @@ Object.assign(osmRelation.prototype, {
},
hasFromViaTo: function() {
return (
this.members.some(function(m) { return m.role === 'from'; }) &&
this.members.some(function(m) { return m.role === 'via'; }) &&
this.members.some(function(m) { return m.role === 'to'; })
);
},
isRestriction: function() {
return !!(this.tags.type && this.tags.type.match(/^restriction:?/));
},
test/spec/osm/relation.js
+79
View File
@@ -185,6 +185,85 @@ describe('iD.osmRelation', function () {
});
});
describe('#hasFromViaTo', function () {
it('returns true if there is a from, via, and to', function () {
var r = iD.osmRelation({
id: 'r',
tags: { type: 'manoeuvre' },
members: [
{ role: 'from', id: 'f', type: 'way' },
{ role: 'via', id: 'v', type: 'node' },
{ role: 'to', id: 't', type: 'way' }
]
});
expect(r.hasFromViaTo()).to.be.true;
});
it('returns true if there are extra froms, vias, tos', function () {
var r = iD.osmRelation({
id: 'r',
tags: { type: 'manoeuvre' },
members: [
{ role: 'from', id: 'f1', type: 'way' },
{ role: 'from', id: 'f2', type: 'way' },
{ role: 'via', id: 'v1', type: 'node' },
{ role: 'via', id: 'v2', type: 'node' },
{ role: 'to', id: 't1', type: 'way' },
{ role: 'to', id: 't2', type: 'way' }
]
});
expect(r.hasFromViaTo()).to.be.true;
});
it('returns false if from missing', function () {
var r = iD.osmRelation({
id: 'r',
tags: { type: 'manoeuvre' },
members: [
{ role: 'via', id: 'v', type: 'node' },
{ role: 'to', id: 't', type: 'way' }
]
});
expect(r.hasFromViaTo()).to.be.false;
});
it('returns false if via missing', function () {
var r = iD.osmRelation({
id: 'r',
tags: { type: 'manoeuvre' },
members: [
{ role: 'from', id: 'f', type: 'way' },
{ role: 'to', id: 't', type: 'way' }
]
});
expect(r.hasFromViaTo()).to.be.false;
});
it('returns false if to missing', function () {
var r = iD.osmRelation({
id: 'r',
tags: { type: 'manoeuvre' },
members: [
{ role: 'from', id: 'f', type: 'way' },
{ role: 'via', id: 'v', type: 'node' }
]
});
expect(r.hasFromViaTo()).to.be.false;
});
it('returns false if all missing', function () {
var r = iD.osmRelation({
id: 'r',
tags: { type: 'multipolygon' },
members: [
{ role: 'inner', id: 'i', type: 'way' },
{ role: 'outer', id: 'o', type: 'way' }
]
});
expect(r.hasFromViaTo()).to.be.false;
});
});
describe('#isRestriction', function () {
it('returns true for \'restriction\' type', function () {
expect(iD.osmRelation({tags: {type: 'restriction'}}).isRestriction()).to.be.true;