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

Fix merge issues

Browse Source
This commit is contained in:
Bryan Housel
2018-12-19 17:12:06 -05:00
parent c501c44f60
commit 2deadd5d6c
12 changed files with 110 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/svg/layers.js
-13
View File
@@ -27,7 +27,6 @@ describe('iD.svgLayers', function () {
container.call(iD.svgLayers(projection, context));
var nodes = container.selectAll('svg .data-layer').nodes();
expect(nodes.length).to.eql(10);
<<<<<<< HEAD
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;
@@ -38,18 +37,6 @@ describe('iD.svgLayers', function () {
expect(d3.select(nodes[7]).classed('debug')).to.be.true;
expect(d3.select(nodes[8]).classed('geolocate')).to.be.true;
expect(d3.select(nodes[9]).classed('touch')).to.be.true;
=======
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-keepRight')).to.be.true;
expect(d3.select(nodes[3]).classed('data-layer-gpx')).to.be.true;
expect(d3.select(nodes[4]).classed('data-layer-mvt')).to.be.true;
expect(d3.select(nodes[5]).classed('data-layer-streetside')).to.be.true;
expect(d3.select(nodes[6]).classed('data-layer-mapillary-images')).to.be.true;
expect(d3.select(nodes[7]).classed('data-layer-mapillary-signs')).to.be.true;
expect(d3.select(nodes[8]).classed('data-layer-openstreetcam-images')).to.be.true;
expect(d3.select(nodes[9]).classed('data-layer-debug')).to.be.true;
>>>>>>> displaying keep right (currently as notes)
});
});