CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-22 08:17:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Treat entities on addr:interpolation lines as points, not vertices

Browse Source 
(closes #3241)
This commit is contained in:
Bryan Housel
2016-07-14 13:00:36 -04:00
parent 5f496f2020
commit 0d8fb87f93
4 changed files with 56 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/presets/presets.js
+26 -8
View File
@@ -8,16 +8,16 @@ describe('iD.presets.presets', function() {
tags: {},
geometry: ['line']
},
vertex: {
tags: {},
geometry: ['vertex']
},
residential: {
tags: {
highway: 'residential'
},
tags: { highway: 'residential' },
geometry: ['line']
},
park: {
tags: {
leisure: 'park'
},
tags: { leisure: 'park' },
geometry: ['point', 'area']
}
};
@@ -26,18 +26,36 @@ describe('iD.presets.presets', function() {
describe('#match', function() {
it('returns a collection containing presets matching a geometry and tags', function() {
var way = iD.Way({tags: { highway: 'residential'}}),
var way = iD.Way({ tags: { highway: 'residential' } }),
graph = iD.Graph([way]);
expect(c.match(way, graph).id).to.eql('residential');
});
it('returns the appropriate fallback preset when no tags match', function() {
var point = iD.Node(),
line = iD.Way({tags: {foo: 'bar'}}),
line = iD.Way({ tags: { foo: 'bar' } }),
graph = iD.Graph([point, line]);
expect(c.match(point, graph).id).to.eql('point');
expect(c.match(line, graph).id).to.eql('line');
});
it('matches vertices on a line as vertices', function() {
var point = iD.Node({ tags: { leisure: 'park' } }),
line = iD.Way({ nodes: [point.id], tags: { 'highway': 'residential' } }),
graph = iD.Graph([point, line]);
expect(c.match(point, graph).id).to.eql('vertex');
});
it('matches vertices on an addr:interpolation line as points', function() {
var point = iD.Node({ tags: { leisure: 'park' } }),
line = iD.Way({ nodes: [point.id], tags: { 'addr:interpolation': 'even' } }),
graph = iD.Graph([point, line]);
expect(c.match(point, graph).id).to.eql('park');
});
});
describe('#areaKeys', function() {