CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-31 04:09:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Split "other" preset into geometry specific fallbacks

Browse Source 
This way the name and icon can be geometry-specific.
This commit is contained in:
John Firebaugh
2013-05-24 11:14:45 -07:00
parent ab10f8ac38
commit 5868875833
15 changed files with 144 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/presets.js
+12 -6
View File
@@ -1,8 +1,12 @@
describe("iD.presets", function() {
var p = {
other: {
point: {
tags: {},
geometry: ['point', 'vertex', 'line', 'area']
geometry: ['point']
},
line: {
tags: {},
geometry: ['line']
},
residential: {
tags: {
@@ -29,10 +33,12 @@ describe("iD.presets", function() {
expect(c.match(way, graph).id).to.eql('residential');
});
it("returns an other preset when no tags match", function() {
var way = iD.Way({tags: {foo: 'bar'}}),
graph = iD.Graph([way]);
expect(c.match(way, graph).id).to.eql('other');
it("returns the appropriate fallback preset when no tags match", function() {
var point = iD.Node(),
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');
});
});
});
test/spec/presets/preset.js
+14 -8
View File
@@ -34,7 +34,7 @@ describe('iD.presets.Preset', function() {
it("has optional fields", function() {
expect(p.other.fields).to.eql([]);
expect(p.point.fields).to.eql([]);
});
describe('#matchGeometry', function() {
@@ -46,17 +46,17 @@ describe('iD.presets.Preset', function() {
});
it("returns true if it does match", function() {
expect(p.other.matchGeometry('point')).to.equal(true);
expect(p.point.matchGeometry('point')).to.equal(true);
});
});
describe('#matchScore', function() {
it("returns -1 if preset does not match tags", function() {
it("returns -1 if preset does not match tags", function() {
expect(p['highway/residential'].matchScore(w1)).to.equal(-1);
});
it("returns 0 for other preset (no match tags)", function() {
expect(p.other.matchScore(w1)).to.equal(0);
it("returns 0 for fallback presets", function() {
expect(p.point.matchScore(w1)).to.equal(0);
});
it("returns the number of matched tags", function() {
@@ -68,11 +68,19 @@ describe('iD.presets.Preset', function() {
expect(p.building.matchScore(w4)).to.equal(0.5);
expect(p.building.matchScore(w5)).to.equal(-1);
});
});
describe("isFallback", function() {
it("returns true if preset has no tags", function() {
expect(iD.presets.Preset("area", {name: "Area", tags: {}}).isFallback()).to.equal(true);
});
it("returns false if preset has no tags", function() {
expect(p.building.isFallback()).to.equal(false);
});
});
describe('#applyTags', function() {
it("adds match tags", function() {
expect(p['highway/residential'].applyTags({}, 'area')).to.eql({ highway: 'residential' });
});
@@ -88,7 +96,6 @@ describe('iD.presets.Preset', function() {
});
describe('#removeTags', function() {
it('removes match tags', function() {
expect(p['highway/residential'].removeTags({ highway: 'residential' }, 'area')).to.eql({});
});
@@ -98,5 +105,4 @@ describe('iD.presets.Preset', function() {
expect(p['amenity/cafe'].removeTags({ amenity: 'cafe', building: 'yep'}, 'area')).to.eql({ building: 'yep'});
});
});
});