Rename ol/objectutil.js to ol/obj.js
This commit is contained in:
@@ -4,7 +4,7 @@ goog.provide('ol.layer.LayerProperty');
|
||||
goog.require('ol');
|
||||
goog.require('ol.Object');
|
||||
goog.require('ol.math');
|
||||
goog.require('ol.object');
|
||||
goog.require('ol.obj');
|
||||
goog.require('ol.source.State');
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ ol.layer.Base = function(options) {
|
||||
/**
|
||||
* @type {Object.<string, *>}
|
||||
*/
|
||||
var properties = ol.object.assign({}, options);
|
||||
var properties = ol.obj.assign({}, options);
|
||||
properties[ol.layer.LayerProperty.OPACITY] =
|
||||
options.opacity !== undefined ? options.opacity : 1;
|
||||
properties[ol.layer.LayerProperty.VISIBLE] =
|
||||
|
||||
@@ -7,7 +7,7 @@ goog.require('ol.events');
|
||||
goog.require('ol.events.EventType');
|
||||
goog.require('ol.extent');
|
||||
goog.require('ol.layer.Base');
|
||||
goog.require('ol.object');
|
||||
goog.require('ol.obj');
|
||||
goog.require('ol.source.State');
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ ol.layer.Group = function(opt_options) {
|
||||
|
||||
var options = opt_options || {};
|
||||
var baseOptions = /** @type {olx.layer.GroupOptions} */
|
||||
(ol.object.assign({}, options));
|
||||
(ol.obj.assign({}, options));
|
||||
delete baseOptions.layers;
|
||||
|
||||
var layers = options.layers;
|
||||
@@ -103,7 +103,7 @@ ol.layer.Group.prototype.handleLayersChanged_ = function(event) {
|
||||
for (var id in this.listenerKeys_) {
|
||||
this.listenerKeys_[id].forEach(ol.events.unlistenByKey);
|
||||
}
|
||||
ol.object.clear(this.listenerKeys_);
|
||||
ol.obj.clear(this.listenerKeys_);
|
||||
|
||||
var layersArray = layers.getArray();
|
||||
var i, ii, layer;
|
||||
|
||||
@@ -6,7 +6,7 @@ goog.require('ol.Object');
|
||||
goog.require('ol.dom');
|
||||
goog.require('ol.layer.Vector');
|
||||
goog.require('ol.math');
|
||||
goog.require('ol.object');
|
||||
goog.require('ol.obj');
|
||||
goog.require('ol.render.EventType');
|
||||
goog.require('ol.style.Icon');
|
||||
goog.require('ol.style.Style');
|
||||
@@ -38,7 +38,7 @@ ol.layer.HeatmapLayerProperty = {
|
||||
ol.layer.Heatmap = function(opt_options) {
|
||||
var options = opt_options ? opt_options : {};
|
||||
|
||||
var baseOptions = ol.object.assign({}, options);
|
||||
var baseOptions = ol.obj.assign({}, options);
|
||||
|
||||
delete baseOptions.gradient;
|
||||
delete baseOptions.radius;
|
||||
|
||||
@@ -6,7 +6,7 @@ goog.require('ol');
|
||||
goog.require('ol.Object');
|
||||
goog.require('ol.layer.Base');
|
||||
goog.require('ol.layer.LayerProperty');
|
||||
goog.require('ol.object');
|
||||
goog.require('ol.obj');
|
||||
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 = ol.object.assign({}, options);
|
||||
var baseOptions = ol.obj.assign({}, options);
|
||||
delete baseOptions.source;
|
||||
|
||||
ol.layer.Base.call(this, /** @type {olx.layer.BaseOptions} */ (baseOptions));
|
||||
|
||||
@@ -2,7 +2,7 @@ goog.provide('ol.layer.Tile');
|
||||
|
||||
goog.require('ol');
|
||||
goog.require('ol.layer.Layer');
|
||||
goog.require('ol.object');
|
||||
goog.require('ol.obj');
|
||||
|
||||
|
||||
/**
|
||||
@@ -31,7 +31,7 @@ ol.layer.TileProperty = {
|
||||
ol.layer.Tile = function(opt_options) {
|
||||
var options = opt_options ? opt_options : {};
|
||||
|
||||
var baseOptions = ol.object.assign({}, options);
|
||||
var baseOptions = ol.obj.assign({}, options);
|
||||
|
||||
delete baseOptions.preload;
|
||||
delete baseOptions.useInterimTilesOnError;
|
||||
|
||||
@@ -2,7 +2,7 @@ goog.provide('ol.layer.Vector');
|
||||
|
||||
goog.require('ol');
|
||||
goog.require('ol.layer.Layer');
|
||||
goog.require('ol.object');
|
||||
goog.require('ol.obj');
|
||||
goog.require('ol.style.Style');
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ ol.layer.Vector = function(opt_options) {
|
||||
typeof options.renderOrder === 'function',
|
||||
'renderOrder must be a comparator function');
|
||||
|
||||
var baseOptions = ol.object.assign({}, options);
|
||||
var baseOptions = ol.obj.assign({}, options);
|
||||
|
||||
delete baseOptions.style;
|
||||
delete baseOptions.renderBuffer;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
goog.provide('ol.layer.VectorTile');
|
||||
|
||||
goog.require('ol.layer.Vector');
|
||||
goog.require('ol.object');
|
||||
goog.require('ol.obj');
|
||||
|
||||
|
||||
/**
|
||||
@@ -48,7 +48,7 @@ ol.layer.VectorTileRenderType = {
|
||||
ol.layer.VectorTile = function(opt_options) {
|
||||
var options = opt_options ? opt_options : {};
|
||||
|
||||
var baseOptions = ol.object.assign({}, options);
|
||||
var baseOptions = ol.obj.assign({}, options);
|
||||
|
||||
delete baseOptions.preload;
|
||||
delete baseOptions.useInterimTilesOnError;
|
||||
|
||||
Reference in New Issue
Block a user