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

Adjust layer ordering to draw touch targets above data layers

Browse Source
This commit is contained in:
Bryan Housel
2018-11-09 16:51:19 -05:00
parent 3e313cffe4
commit 3bc841e95b
18 changed files with 132 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/behavior/select.js
+1 -1
View File
@@ -14,7 +14,7 @@ describe('iD.behaviorSelect', function() {
.append('div')
.attr('class', 'inspector-wrap');
context.surface().select('.data-layer-osm').selectAll('circle')
context.surface().select('.data-layer.osm').selectAll('circle')
.data([a, b])
.enter().append('circle')
.attr('class', function(d) { return d.id; });
test/spec/svg/layers.js
+10 -9
View File
@@ -26,15 +26,16 @@ describe('iD.svgLayers', function () {
it('creates default data layers', function () {
container.call(iD.svgLayers(projection, context));
var nodes = container.selectAll('svg .data-layer').nodes();
expect(nodes.length).to.eql(8);
expect(d3.select(nodes[0]).classed('data-layer-osm')).to.be.true;
expect(d3.select(nodes[1]).classed('data-layer-notes')).to.be.true;
expect(d3.select(nodes[2]).classed('data-layer-data')).to.be.true;
expect(d3.select(nodes[3]).classed('data-layer-streetside')).to.be.true;
expect(d3.select(nodes[4]).classed('data-layer-mapillary-images')).to.be.true;
expect(d3.select(nodes[5]).classed('data-layer-mapillary-signs')).to.be.true;
expect(d3.select(nodes[6]).classed('data-layer-openstreetcam-images')).to.be.true;
expect(d3.select(nodes[7]).classed('data-layer-debug')).to.be.true;
expect(nodes.length).to.eql(9);
expect(d3.select(nodes[0]).classed('osm')).to.be.true;
expect(d3.select(nodes[1]).classed('notes')).to.be.true;
expect(d3.select(nodes[2]).classed('data')).to.be.true;
expect(d3.select(nodes[3]).classed('streetside')).to.be.true;
expect(d3.select(nodes[4]).classed('mapillary-images')).to.be.true;
expect(d3.select(nodes[5]).classed('mapillary-signs')).to.be.true;
expect(d3.select(nodes[6]).classed('openstreetcam-images')).to.be.true;
expect(d3.select(nodes[7]).classed('debug')).to.be.true;
expect(d3.select(nodes[8]).classed('touch')).to.be.true;
});
});
test/spec/svg/osm.js
+11 -21
View File
@@ -9,31 +9,21 @@ describe('iD.svgOsm', function () {
container.call(iD.svgOsm());
var layers = container.selectAll('g.layer-osm').nodes();
expect(layers.length).to.eql(5);
expect(d3.select(layers[0]).classed('layer-covered')).to.be.true;
expect(d3.select(layers[1]).classed('layer-areas')).to.be.true;
expect(d3.select(layers[2]).classed('layer-lines')).to.be.true;
expect(d3.select(layers[3]).classed('layer-points')).to.be.true;
expect(d3.select(layers[4]).classed('layer-labels')).to.be.true;
expect(d3.select(layers[0]).classed('covered')).to.be.true;
expect(d3.select(layers[1]).classed('areas')).to.be.true;
expect(d3.select(layers[2]).classed('lines')).to.be.true;
expect(d3.select(layers[3]).classed('points')).to.be.true;
expect(d3.select(layers[4]).classed('labels')).to.be.true;
});
it('creates default osm point layers', function () {
container.call(iD.svgOsm());
var layers = container.selectAll('g.layer-points g.layer-points-group').nodes();
expect(layers.length).to.eql(5);
expect(d3.select(layers[0]).classed('layer-points-points')).to.be.true;
expect(d3.select(layers[1]).classed('layer-points-midpoints')).to.be.true;
expect(d3.select(layers[2]).classed('layer-points-vertices')).to.be.true;
expect(d3.select(layers[3]).classed('layer-points-turns')).to.be.true;
expect(d3.select(layers[4]).classed('layer-points-targets')).to.be.true;
});
it('creates default osm label layers', function () {
container.call(iD.svgOsm());
var layers = container.selectAll('g.layer-labels g.layer-labels-group').nodes();
expect(layers.length).to.eql(3);
expect(d3.select(layers[0]).classed('layer-labels-halo')).to.be.true;
expect(d3.select(layers[1]).classed('layer-labels-label')).to.be.true;
expect(d3.select(layers[2]).classed('layer-labels-debug')).to.be.true;
var layers = container.selectAll('g.points-group').nodes();
expect(layers.length).to.eql(4);
expect(d3.select(layers[0]).classed('points')).to.be.true;
expect(d3.select(layers[1]).classed('midpoints')).to.be.true;
expect(d3.select(layers[2]).classed('vertices')).to.be.true;
expect(d3.select(layers[3]).classed('turns')).to.be.true;
});
});