Merge branch 'master' of github.com:openlayers/ol3 into vector

This commit is contained in:
Tim Schaub
2013-03-07 23:10:06 -07:00
120 changed files with 16315 additions and 1555 deletions
+2 -2
View File
@@ -5,7 +5,7 @@ describe('ol.source.TileSource', function() {
describe('constructor', function() {
it('returns a tile source', function() {
var source = new ol.source.TileSource({
projection: ol.projection.getFromCode('EPSG:4326')
projection: ol.projection.get('EPSG:4326')
});
expect(source).toBeA(ol.source.Source);
expect(source).toBeA(ol.source.TileSource);
@@ -202,7 +202,7 @@ ol.test.source.MockTileSource = function(loaded) {
goog.base(this, {
extent: extent,
projection: ol.projection.getFromCode('EPSG:4326'),
projection: ol.projection.get('EPSG:4326'),
tileGrid: tileGrid
});