diff --git a/src/ol/control/attributioncontrol.js b/src/ol/control/attributioncontrol.js index 2aec3d73c8..8da0c15e8d 100644 --- a/src/ol/control/attributioncontrol.js +++ b/src/ol/control/attributioncontrol.js @@ -13,6 +13,7 @@ goog.require('ol'); goog.require('ol.Attribution'); goog.require('ol.control.Control'); goog.require('ol.css'); +goog.require('ol.object'); goog.require('ol.source.Tile'); @@ -150,7 +151,7 @@ ol.control.Attribution.prototype.getSourceAttributions = function(frameState) { var intersectsTileRange; var layerStatesArray = frameState.layerStatesArray; /** @type {Object.} */ - var attributions = goog.object.clone(frameState.attributions); + var attributions = ol.object.assign({}, frameState.attributions); /** @type {Object.} */ var hiddenAttributions = {}; var projection = frameState.viewState.projection; diff --git a/src/ol/format/esrijsonformat.js b/src/ol/format/esrijsonformat.js index 7d62c8d00d..670f062d22 100644 --- a/src/ol/format/esrijsonformat.js +++ b/src/ol/format/esrijsonformat.js @@ -17,6 +17,7 @@ goog.require('ol.geom.MultiPolygon'); goog.require('ol.geom.Point'); goog.require('ol.geom.Polygon'); goog.require('ol.geom.flat.orient'); +goog.require('ol.object'); goog.require('ol.proj'); @@ -70,7 +71,7 @@ ol.format.EsriJSON.readGeometry_ = function(object, opt_options) { } else if (object.rings) { var layout = ol.format.EsriJSON.getGeometryLayout_(object); var rings = ol.format.EsriJSON.convertRings_(object.rings, layout); - object = /** @type {EsriJSONGeometry} */(goog.object.clone(object)); + object = /** @type {EsriJSONGeometry} */(ol.object.assign({}, object)); if (rings.length === 1) { type = ol.geom.GeometryType.POLYGON; object.rings = rings[0]; diff --git a/src/ol/format/gml/gml3format.js b/src/ol/format/gml/gml3format.js index 2696457e37..e6f548b3a1 100644 --- a/src/ol/format/gml/gml3format.js +++ b/src/ol/format/gml/gml3format.js @@ -19,6 +19,7 @@ goog.require('ol.geom.MultiLineString'); goog.require('ol.geom.MultiPolygon'); goog.require('ol.geom.Point'); goog.require('ol.geom.Polygon'); +goog.require('ol.object'); goog.require('ol.proj'); goog.require('ol.xml'); @@ -1003,7 +1004,7 @@ ol.format.GML3.prototype.writeCurveSegments_ = function(node, line, objectStack) ol.format.GML3.prototype.writeGeometryElement = function(node, geometry, objectStack) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context), 'context should be an Object'); - var item = goog.object.clone(context); + var item = ol.object.assign({}, context); item.node = node; var value; if (goog.isArray(geometry)) { @@ -1064,7 +1065,7 @@ ol.format.GML3.prototype.writeFeatureElement = function(node, feature, objectSta } } } - var item = goog.object.clone(context); + var item = ol.object.assign({}, context); item.node = node; ol.xml.pushSerializeAndPop(/** @type {ol.xml.NodeStackItem} */ (item), context.serializers, @@ -1089,7 +1090,7 @@ ol.format.GML3.prototype.writeFeatureMembers_ = function(node, features, objectS serializers[featureNS] = {}; serializers[featureNS][featureType] = ol.xml.makeChildAppender( this.writeFeatureElement, this); - var item = goog.object.clone(context); + var item = ol.object.assign({}, context); item.node = node; ol.xml.pushSerializeAndPop(/** @type {ol.xml.NodeStackItem} */ (item), diff --git a/src/ol/format/wfsformat.js b/src/ol/format/wfsformat.js index 4159a2e56f..a8caa61168 100644 --- a/src/ol/format/wfsformat.js +++ b/src/ol/format/wfsformat.js @@ -9,6 +9,7 @@ goog.require('ol.format.GMLBase'); goog.require('ol.format.XMLFeature'); goog.require('ol.format.XSD'); goog.require('ol.geom.Geometry'); +goog.require('ol.object'); goog.require('ol.proj'); goog.require('ol.xml'); @@ -543,7 +544,7 @@ ol.format.WFS.writeQuery_ = function(node, featureType, objectStack) { ol.xml.setAttributeNS(node, ol.format.WFS.XMLNS, 'xmlns:' + featurePrefix, featureNS); } - var item = goog.object.clone(context); + var item = ol.object.assign({}, context); item.node = node; ol.xml.pushSerializeAndPop(item, ol.format.WFS.QUERY_SERIALIZERS_, @@ -610,7 +611,7 @@ ol.format.WFS.GETFEATURE_SERIALIZERS_ = { ol.format.WFS.writeGetFeature_ = function(node, featureTypes, objectStack) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context), 'context should be an Object'); - var item = goog.object.clone(context); + var item = ol.object.assign({}, context); item.node = node; ol.xml.pushSerializeAndPop(item, ol.format.WFS.GETFEATURE_SERIALIZERS_, diff --git a/src/ol/layer/heatmaplayer.js b/src/ol/layer/heatmaplayer.js index a5daba97ea..40d17252e3 100644 --- a/src/ol/layer/heatmaplayer.js +++ b/src/ol/layer/heatmaplayer.js @@ -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; diff --git a/src/ol/layer/layer.js b/src/ol/layer/layer.js index 61ae7a32c0..b36f80204b 100644 --- a/src/ol/layer/layer.js +++ b/src/ol/layer/layer.js @@ -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)); diff --git a/src/ol/layer/layerbase.js b/src/ol/layer/layerbase.js index 6d4dfef89b..2b498c5403 100644 --- a/src/ol/layer/layerbase.js +++ b/src/ol/layer/layerbase.js @@ -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.} */ - 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] = diff --git a/src/ol/layer/layergroup.js b/src/ol/layer/layergroup.js index 291ee58e7c..daa3db3524 100644 --- a/src/ol/layer/layergroup.js +++ b/src/ol/layer/layergroup.js @@ -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; diff --git a/src/ol/layer/tilelayer.js b/src/ol/layer/tilelayer.js index 0430749ffb..4bf1d26ceb 100644 --- a/src/ol/layer/tilelayer.js +++ b/src/ol/layer/tilelayer.js @@ -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; diff --git a/src/ol/layer/vectorlayer.js b/src/ol/layer/vectorlayer.js index f2f30d7ab5..a001e370e2 100644 --- a/src/ol/layer/vectorlayer.js +++ b/src/ol/layer/vectorlayer.js @@ -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; diff --git a/src/ol/layer/vectortilelayer.js b/src/ol/layer/vectortilelayer.js index 50a7a63485..0631c893b0 100644 --- a/src/ol/layer/vectortilelayer.js +++ b/src/ol/layer/vectortilelayer.js @@ -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; diff --git a/src/ol/map.js b/src/ol/map.js index 785de7fcad..ecd7aa41c7 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -44,6 +44,7 @@ goog.require('ol.has'); goog.require('ol.interaction'); goog.require('ol.layer.Base'); goog.require('ol.layer.Group'); +goog.require('ol.object'); goog.require('ol.proj'); goog.require('ol.proj.common'); goog.require('ol.renderer.Map'); @@ -1325,7 +1326,7 @@ ol.Map.prototype.renderFrame_ = function(time) { index: this.frameIndex_++, layerStates: layerStates, layerStatesArray: layerStatesArray, - logos: goog.object.clone(this.logos_), + logos: ol.object.assign({}, this.logos_), pixelRatio: this.pixelRatio_, pixelToCoordinateMatrix: this.pixelToCoordinateMatrix_, postRenderFunctions: [], diff --git a/src/ol/source/rastersource.js b/src/ol/source/rastersource.js index 16d918b076..3e3090327a 100644 --- a/src/ol/source/rastersource.js +++ b/src/ol/source/rastersource.js @@ -3,18 +3,18 @@ goog.provide('ol.source.RasterEvent'); goog.provide('ol.source.RasterEventType'); goog.require('goog.asserts'); -goog.require('ol.events'); -goog.require('ol.events.Event'); -goog.require('ol.events.EventType'); -goog.require('goog.object'); goog.require('goog.vec.Mat4'); goog.require('ol.ImageCanvas'); goog.require('ol.TileQueue'); goog.require('ol.dom'); +goog.require('ol.events'); +goog.require('ol.events.Event'); +goog.require('ol.events.EventType'); goog.require('ol.ext.pixelworks'); goog.require('ol.extent'); goog.require('ol.layer.Image'); goog.require('ol.layer.Tile'); +goog.require('ol.object'); goog.require('ol.raster.OperationType'); goog.require('ol.renderer.canvas.ImageLayer'); goog.require('ol.renderer.canvas.TileLayer'); @@ -171,10 +171,10 @@ ol.source.Raster.prototype.setOperation = function(operation, opt_lib) { ol.source.Raster.prototype.updateFrameState_ = function(extent, resolution, projection) { var frameState = /** @type {olx.FrameState} */ ( - goog.object.clone(this.frameState_)); + ol.object.assign({}, this.frameState_)); frameState.viewState = /** @type {olx.ViewState} */ ( - goog.object.clone(frameState.viewState)); + ol.object.assign({}, frameState.viewState)); var center = ol.extent.getCenter(extent); var width = Math.round(ol.extent.getWidth(extent) / resolution);