Refactor background in preparation for multiple overlays

This commit is contained in:
John Firebaugh
2013-07-15 12:31:26 -07:00
parent ab566c8fa7
commit 734d53e08b
12 changed files with 362 additions and 327 deletions
+3 -2
View File
@@ -48,7 +48,8 @@
<script src='../js/id/renderer/background.js'></script>
<script src='../js/id/renderer/background_source.js'></script>
<script src='../js/id/renderer/map.js'></script>
<script src='../js/id/renderer/localgpx.js'></script>
<script src='../js/id/renderer/gpx_layer.js'></script>
<script src='../js/id/renderer/tile_layer.js'></script>
<script src="../js/id/svg.js"></script>
<script src="../js/id/svg/areas.js"></script>
@@ -230,7 +231,7 @@
<script src="spec/core/difference.js"></script>
<script src="spec/core/tree.js"></script>
<script src="spec/renderer/background.js"></script>
<script src="spec/renderer/tile_layer.js"></script>
<script src="spec/renderer/background_source.js"></script>
<script src="spec/renderer/map.js"></script>
+1 -1
View File
@@ -61,7 +61,7 @@
<script src="spec/core/difference.js"></script>
<script src="spec/core/tree.js"></script>
<script src="spec/renderer/background.js"></script>
<script src="spec/renderer/tile_layer.js"></script>
<script src="spec/renderer/background_source.js"></script>
<script src="spec/renderer/map.js"></script>
@@ -1,9 +1,9 @@
describe('iD.Background', function() {
describe('iD.TileLayer', function() {
var c, d;
beforeEach(function() {
d = d3.select(document.createElement('div'));
c = iD.Background().projection(d3.geo.mercator());
c = iD.TileLayer().projection(d3.geo.mercator());
d.call(c);
});
@@ -11,7 +11,7 @@ describe('iD.Background', function() {
d.remove();
});
describe('iD.Background', function() {
describe('iD.TileLayer', function() {
it('is instantiated', function() {
expect(c).to.be.ok;
});