ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use ol.object.assign() instead of goog.object.extend()

Browse Source
This commit is contained in:
Tim Schaub
2016-02-03 09:37:38 -07:00
parent a74af66d5f
commit 3c0ef430db
14 changed files with 49 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test_rendering/spec/ol/layer/image.test.js
View File

@@ -44,7 +44,7 @@ describe('ol.rendering.layer.Image', function() {
var options = {
source: source
};
goog.object.extend(options, layerOptions);
ol.object.assign(options, layerOptions);
map.addLayer(new ol.layer.Image(options));
});
}
@@ -109,9 +109,9 @@ describe('ol.rendering.layer.Image', function() {
});
goog.require('goog.object');
goog.require('ol.proj');
goog.require('ol.Map');
goog.require('ol.View');
goog.require('ol.layer.Image');
goog.require('ol.object');
goog.require('ol.proj');
goog.require('ol.source.ImageStatic');

6
test_rendering/spec/ol/layer/tile.test.js
View File

@@ -44,7 +44,7 @@ describe('ol.rendering.layer.Tile', function() {
var options = {
source: source
};
goog.object.extend(options, layerOptions);
ol.object.assign(options, layerOptions);
map.addLayer(new ol.layer.Tile(options));
});
}
@@ -190,11 +190,11 @@ describe('ol.rendering.layer.Tile', function() {
});
goog.require('goog.object');
goog.require('ol.proj');
goog.require('ol.Map');
goog.require('ol.View');
goog.require('ol.layer.Tile');
goog.require('ol.object');
goog.require('ol.proj');
goog.require('ol.source.TileImage');
goog.require('ol.source.XYZ');
goog.require('ol.tilegrid.TileGrid');

6
test_rendering/spec/ol/layer/vectortile.test.js
View File

@@ -42,7 +42,7 @@ describe('ol.rendering.layer.VectorTile', function() {
var options = {
source: source
};
goog.object.extend(options, layerOptions);
ol.object.assign(options, layerOptions);
map.addLayer(new ol.layer.VectorTile(options));
}
@@ -74,9 +74,9 @@ describe('ol.rendering.layer.VectorTile', function() {
});
goog.require('goog.object');
goog.require('ol.format.MVT');
goog.require('ol.Map');
goog.require('ol.View');
goog.require('ol.format.MVT');
goog.require('ol.layer.VectorTile');
goog.require('ol.object');
goog.require('ol.source.VectorTile');