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

Insert areas in sorted order

Browse Source 
Fixes #1693
This commit is contained in:
John Firebaugh
2013-08-26 15:18:53 -07:00
parent 0a23c395ed
commit 30f68c4ef9
2 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/id/svg/areas.js
+13 -2
View File
@@ -61,13 +61,25 @@ iD.svg.Areas = function(projection) {
fill: areas
};
var bisect = d3.bisector(function(node) {
return -node.__data__.area(graph);
}).left;
var fills = surface.selectAll('.layer-fill path.area')[0];
function sortedByArea(entity) {
if (this.__data__ === 'fill') {
return fills[bisect(fills, -entity.area(graph))];
}
}
var paths = surface.selectAll('.layer-shadow, .layer-stroke, .layer-fill')
.selectAll('path.area')
.filter(filter)
.data(function(layer) { return data[layer]; }, iD.Entity.key);
paths.enter()
.append('path')
.insert('path', sortedByArea)
.each(function(entity) {
var layer = this.parentNode.__data__;
@@ -80,7 +92,6 @@ iD.svg.Areas = function(projection) {
.call(iD.svg.TagClasses());
paths
.order()
.attr('d', path);
paths.exit()
test/spec/svg/areas.js
+31 -7
View File
@@ -1,7 +1,7 @@
describe("iD.svg.Areas", function () {
var surface,
projection = Object,
filter = d3.functor(true);
filter = d3.functor(false);
beforeEach(function () {
surface = d3.select(document.createElementNS('http://www.w3.org/2000/svg', 'svg'))
@@ -51,7 +51,7 @@ describe("iD.svg.Areas", function () {
expect(surface.selectAll('.other')[0].length).to.equal(1);
});
it("stacks smaller areas above larger ones", function () {
describe("z-indexing", function() {
var graph = iD.Graph({
'a': iD.Node({id: 'a', loc: [-0.0002, 0.0001]}),
'b': iD.Node({id: 'b', loc: [ 0.0002, 0.0001]}),
@@ -63,13 +63,37 @@ describe("iD.svg.Areas", function () {
'h': iD.Node({id: 'd', loc: [-0.0004, -0.0002]}),
's': iD.Way({id: 's', tags: {building: 'yes'}, nodes: ['a', 'b', 'c', 'd', 'a']}),
'l': iD.Way({id: 'l', tags: {landuse: 'park'}, nodes: ['e', 'f', 'g', 'h', 'e']})
}),
areas = [graph.entity('s'), graph.entity('l')];
});
surface.call(iD.svg.Areas(projection), graph, areas, filter);
it("stacks smaller areas above larger ones in a single render", function () {
surface.call(iD.svg.Areas(projection), graph, [graph.entity('s'), graph.entity('l')], filter);
expect(surface.select('.area:nth-child(1)')).to.be.classed('tag-landuse-park');
expect(surface.select('.area:nth-child(2)')).to.be.classed('tag-building-yes');
expect(surface.select('.area:nth-child(1)')).to.be.classed('tag-landuse-park');
expect(surface.select('.area:nth-child(2)')).to.be.classed('tag-building-yes');
});
it("stacks smaller areas above larger ones in a single render (reverse)", function () {
surface.call(iD.svg.Areas(projection), graph, [graph.entity('l'), graph.entity('s')], filter);
expect(surface.select('.area:nth-child(1)')).to.be.classed('tag-landuse-park');
expect(surface.select('.area:nth-child(2)')).to.be.classed('tag-building-yes');
});
it("stacks smaller areas above larger ones in separate renders", function () {
surface.call(iD.svg.Areas(projection), graph, [graph.entity('s')], filter);
surface.call(iD.svg.Areas(projection), graph, [graph.entity('l')], filter);
expect(surface.select('.area:nth-child(1)')).to.be.classed('tag-landuse-park');
expect(surface.select('.area:nth-child(2)')).to.be.classed('tag-building-yes');
});
it("stacks smaller areas above larger ones in separate renders (reverse)", function () {
surface.call(iD.svg.Areas(projection), graph, [graph.entity('l')], filter);
surface.call(iD.svg.Areas(projection), graph, [graph.entity('s')], filter);
expect(surface.select('.area:nth-child(1)')).to.be.classed('tag-landuse-park');
expect(surface.select('.area:nth-child(2)')).to.be.classed('tag-building-yes');
});
});
it("renders fills for multipolygon areas", function () {