Use ol.object.assign() instead of goog.object.clone()
This commit is contained in:
@@ -2,12 +2,12 @@ goog.provide('ol.layer.Heatmap');
|
||||
|
||||
goog.require('goog.asserts');
|
||||
goog.require('ol.events');
|
||||
goog.require('goog.object');
|
||||
goog.require('ol');
|
||||
goog.require('ol.Object');
|
||||
goog.require('ol.dom');
|
||||
goog.require('ol.layer.Vector');
|
||||
goog.require('ol.math');
|
||||
goog.require('ol.object');
|
||||
goog.require('ol.render.EventType');
|
||||
goog.require('ol.style.Icon');
|
||||
goog.require('ol.style.Style');
|
||||
@@ -39,7 +39,7 @@ ol.layer.HeatmapLayerProperty = {
|
||||
ol.layer.Heatmap = function(opt_options) {
|
||||
var options = opt_options ? opt_options : {};
|
||||
|
||||
var baseOptions = goog.object.clone(options);
|
||||
var baseOptions = ol.object.assign({}, options);
|
||||
|
||||
delete baseOptions.gradient;
|
||||
delete baseOptions.radius;
|
||||
|
||||
@@ -2,11 +2,11 @@ goog.provide('ol.layer.Layer');
|
||||
|
||||
goog.require('ol.events');
|
||||
goog.require('ol.events.EventType');
|
||||
goog.require('goog.object');
|
||||
goog.require('ol');
|
||||
goog.require('ol.Object');
|
||||
goog.require('ol.layer.Base');
|
||||
goog.require('ol.layer.LayerProperty');
|
||||
goog.require('ol.object');
|
||||
goog.require('ol.render.EventType');
|
||||
goog.require('ol.source.State');
|
||||
|
||||
@@ -34,7 +34,7 @@ goog.require('ol.source.State');
|
||||
*/
|
||||
ol.layer.Layer = function(options) {
|
||||
|
||||
var baseOptions = goog.object.clone(options);
|
||||
var baseOptions = ol.object.assign({}, options);
|
||||
delete baseOptions.source;
|
||||
|
||||
goog.base(this, /** @type {olx.layer.LayerOptions} */ (baseOptions));
|
||||
|
||||
@@ -2,10 +2,10 @@ goog.provide('ol.layer.Base');
|
||||
goog.provide('ol.layer.LayerProperty');
|
||||
goog.provide('ol.layer.LayerState');
|
||||
|
||||
goog.require('goog.object');
|
||||
goog.require('ol');
|
||||
goog.require('ol.Object');
|
||||
goog.require('ol.math');
|
||||
goog.require('ol.object');
|
||||
goog.require('ol.source.State');
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@ ol.layer.Base = function(options) {
|
||||
/**
|
||||
* @type {Object.<string, *>}
|
||||
*/
|
||||
var properties = goog.object.clone(options);
|
||||
var properties = ol.object.assign({}, options);
|
||||
properties[ol.layer.LayerProperty.OPACITY] =
|
||||
options.opacity !== undefined ? options.opacity : 1;
|
||||
properties[ol.layer.LayerProperty.VISIBLE] =
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
goog.provide('ol.layer.Group');
|
||||
|
||||
goog.require('goog.asserts');
|
||||
goog.require('goog.object');
|
||||
goog.require('ol.events');
|
||||
goog.require('ol.events.EventType');
|
||||
goog.require('goog.object');
|
||||
goog.require('ol.Collection');
|
||||
goog.require('ol.CollectionEvent');
|
||||
goog.require('ol.CollectionEventType');
|
||||
@@ -11,6 +11,7 @@ goog.require('ol.Object');
|
||||
goog.require('ol.ObjectEventType');
|
||||
goog.require('ol.extent');
|
||||
goog.require('ol.layer.Base');
|
||||
goog.require('ol.object');
|
||||
goog.require('ol.source.State');
|
||||
|
||||
|
||||
@@ -37,7 +38,7 @@ ol.layer.Group = function(opt_options) {
|
||||
|
||||
var options = opt_options || {};
|
||||
var baseOptions = /** @type {olx.layer.GroupOptions} */
|
||||
(goog.object.clone(options));
|
||||
(ol.object.assign({}, options));
|
||||
delete baseOptions.layers;
|
||||
|
||||
var layers = options.layers;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
goog.provide('ol.layer.Tile');
|
||||
|
||||
goog.require('goog.object');
|
||||
goog.require('ol');
|
||||
goog.require('ol.layer.Layer');
|
||||
goog.require('ol.object');
|
||||
|
||||
|
||||
/**
|
||||
@@ -31,7 +31,7 @@ ol.layer.TileProperty = {
|
||||
ol.layer.Tile = function(opt_options) {
|
||||
var options = opt_options ? opt_options : {};
|
||||
|
||||
var baseOptions = goog.object.clone(options);
|
||||
var baseOptions = ol.object.assign({}, options);
|
||||
|
||||
delete baseOptions.preload;
|
||||
delete baseOptions.useInterimTilesOnError;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
goog.provide('ol.layer.Vector');
|
||||
|
||||
goog.require('goog.asserts');
|
||||
goog.require('goog.object');
|
||||
goog.require('ol');
|
||||
goog.require('ol.layer.Layer');
|
||||
goog.require('ol.object');
|
||||
goog.require('ol.style.Style');
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ ol.layer.Vector = function(opt_options) {
|
||||
goog.isFunction(options.renderOrder),
|
||||
'renderOrder must be a comparator function');
|
||||
|
||||
var baseOptions = goog.object.clone(options);
|
||||
var baseOptions = ol.object.assign({}, options);
|
||||
|
||||
delete baseOptions.style;
|
||||
delete baseOptions.renderBuffer;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
goog.provide('ol.layer.VectorTile');
|
||||
|
||||
goog.require('goog.object');
|
||||
goog.require('ol.layer.Vector');
|
||||
goog.require('ol.object');
|
||||
|
||||
|
||||
/**
|
||||
@@ -28,7 +28,7 @@ ol.layer.VectorTileProperty = {
|
||||
ol.layer.VectorTile = function(opt_options) {
|
||||
var options = opt_options ? opt_options : {};
|
||||
|
||||
var baseOptions = goog.object.clone(options);
|
||||
var baseOptions = ol.object.assign({}, options);
|
||||
|
||||
delete baseOptions.preload;
|
||||
delete baseOptions.useInterimTilesOnError;
|
||||
|
||||
Reference in New Issue
Block a user