Rename ol/objectutil.js to ol/obj.js

src/ol/control/attribution.js

@@ -9,7 +9,7 @@ goog.require('ol.control.Control');
 goog.require('ol.css');
 goog.require('ol.events');
 goog.require('ol.events.EventType');
-goog.require('ol.object');
+goog.require('ol.obj');
 
 
 /**
@@ -155,7 +155,7 @@ ol.control.Attribution.prototype.getSourceAttributions = function(frameState) {
   var intersectsTileRange;
   var layerStatesArray = frameState.layerStatesArray;
   /** @type {Object.<string, ol.Attribution>} */
-  var attributions = ol.object.assign({}, frameState.attributions);
+  var attributions = ol.obj.assign({}, frameState.attributions);
   /** @type {Object.<string, ol.Attribution>} */
   var hiddenAttributions = {};
   var projection = /** @type {!ol.proj.Projection} */ (frameState.viewState.projection);
@@ -266,14 +266,14 @@ ol.control.Attribution.prototype.updateElement_ = function(frameState) {
   }
 
   var renderVisible =
-      !ol.object.isEmpty(this.attributionElementRenderedVisible_) ||
+      !ol.obj.isEmpty(this.attributionElementRenderedVisible_) ||
-      !ol.object.isEmpty(frameState.logos);
+      !ol.obj.isEmpty(frameState.logos);
   if (this.renderedVisible_ != renderVisible) {
     this.element.style.display = renderVisible ? '' : 'none';
     this.renderedVisible_ = renderVisible;
   }
   if (renderVisible &&
-      ol.object.isEmpty(this.attributionElementRenderedVisible_)) {
+      ol.obj.isEmpty(this.attributionElementRenderedVisible_)) {
     this.element.classList.add('ol-logo-only');
   } else {
     this.element.classList.remove('ol-logo-only');
@@ -323,7 +323,7 @@ ol.control.Attribution.prototype.insertLogos_ = function(frameState) {
     }
   }
 
-  this.logoLi_.style.display = !ol.object.isEmpty(logos) ? '' : 'none';
+  this.logoLi_.style.display = !ol.obj.isEmpty(logos) ? '' : 'none';
 
 };
 

src/ol/events.js

@@ -2,7 +2,7 @@ goog.provide('ol.events');
 goog.provide('ol.events.EventType');
 goog.provide('ol.events.KeyCode');
 
-goog.require('ol.object');
+goog.require('ol.obj');
 
 
 /**
@@ -140,7 +140,7 @@ ol.events.removeListeners_ = function(target, type) {
   if (listeners) {
     for (var i = 0, ii = listeners.length; i < ii; ++i) {
       target.removeEventListener(type, listeners[i].boundListener);
-      ol.object.clear(listeners[i]);
+      ol.obj.clear(listeners[i]);
     }
     listeners.length = 0;
     var listenerMap = target.ol_lm;
@@ -270,7 +270,7 @@ ol.events.unlistenByKey = function(key) {
         ol.events.removeListeners_(key.target, key.type);
       }
     }
-    ol.object.clear(key);
+    ol.obj.clear(key);
   }
 };
 

src/ol/format/esrijson.js

@@ -15,7 +15,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.obj');
 goog.require('ol.proj');
 
 
@@ -70,7 +70,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} */(ol.object.assign({}, object));
+    object = /** @type {EsriJSONGeometry} */(ol.obj.assign({}, object));
     if (rings.length === 1) {
       type = ol.geom.GeometryType.POLYGON;
       object.rings = rings[0];
@@ -635,7 +635,7 @@ ol.format.EsriJSON.prototype.writeFeatureObject = function(
   }
   var properties = feature.getProperties();
   delete properties[feature.getGeometryName()];
-  if (!ol.object.isEmpty(properties)) {
+  if (!ol.obj.isEmpty(properties)) {
     object['attributes'] = properties;
   } else {
     object['attributes'] = {};

src/ol/format/geojson.js

@@ -13,7 +13,7 @@ goog.require('ol.geom.MultiPoint');
 goog.require('ol.geom.MultiPolygon');
 goog.require('ol.geom.Point');
 goog.require('ol.geom.Polygon');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.proj');
 
 
@@ -206,7 +206,7 @@ ol.format.GeoJSON.writeEmptyGeometryCollectionGeometry_ = function(geometry) {
 ol.format.GeoJSON.writeGeometryCollectionGeometry_ = function(
     geometry, opt_options) {
   var geometries = geometry.getGeometriesArray().map(function(geometry) {
-    var options = ol.object.assign({}, opt_options);
+    var options = ol.obj.assign({}, opt_options);
     delete options.featureProjection;
     return ol.format.GeoJSON.writeGeometry_(geometry, options);
   });
@@ -526,7 +526,7 @@ ol.format.GeoJSON.prototype.writeFeatureObject = function(feature, opt_options)
   }
   var properties = feature.getProperties();
   delete properties[feature.getGeometryName()];
-  if (!ol.object.isEmpty(properties)) {
+  if (!ol.obj.isEmpty(properties)) {
     object.properties = properties;
   } else {
     object.properties = null;

src/ol/format/gml3.js

@@ -15,7 +15,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.obj');
 goog.require('ol.proj');
 goog.require('ol.xml');
 
@@ -984,7 +984,7 @@ ol.format.GML3.prototype.writeCurveSegments_ = function(node, line, objectStack)
  */
 ol.format.GML3.prototype.writeGeometryElement = function(node, geometry, objectStack) {
   var context = /** @type {olx.format.WriteOptions} */ (objectStack[objectStack.length - 1]);
-  var item = ol.object.assign({}, context);
+  var item = ol.obj.assign({}, context);
   item.node = node;
   var value;
   if (Array.isArray(geometry)) {
@@ -1042,7 +1042,7 @@ ol.format.GML3.prototype.writeFeatureElement = function(node, feature, objectSta
       }
     }
   }
-  var item = ol.object.assign({}, context);
+  var item = ol.obj.assign({}, context);
   item.node = node;
   ol.xml.pushSerializeAndPop(/** @type {ol.XmlNodeStackItem} */
       (item), context.serializers,
@@ -1066,7 +1066,7 @@ ol.format.GML3.prototype.writeFeatureMembers_ = function(node, features, objectS
   serializers[featureNS] = {};
   serializers[featureNS][featureType] = ol.xml.makeChildAppender(
       this.writeFeatureElement, this);
-  var item = ol.object.assign({}, context);
+  var item = ol.obj.assign({}, context);
   item.node = node;
   ol.xml.pushSerializeAndPop(/** @type {ol.XmlNodeStackItem} */
       (item),
@@ -1243,7 +1243,7 @@ ol.format.GML3.prototype.writeGeometryNode = function(geometry, opt_options) {
     curve: this.curve_, surface: this.surface_,
     multiSurface: this.multiSurface_, multiCurve: this.multiCurve_};
   if (opt_options) {
-    ol.object.assign(context, opt_options);
+    ol.obj.assign(context, opt_options);
   }
   this.writeGeometryElement(geom, geometry, [context]);
   return geom;
@@ -1286,7 +1286,7 @@ ol.format.GML3.prototype.writeFeaturesNode = function(features, opt_options) {
     featureType: this.featureType
   };
   if (opt_options) {
-    ol.object.assign(context, opt_options);
+    ol.obj.assign(context, opt_options);
   }
   this.writeFeatureMembers_(node, features, [context]);
   return node;

src/ol/format/gmlbase.js

@@ -16,7 +16,7 @@ goog.require('ol.geom.MultiPoint');
 goog.require('ol.geom.MultiPolygon');
 goog.require('ol.geom.Point');
 goog.require('ol.geom.Polygon');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.proj');
 goog.require('ol.xml');
 
@@ -629,7 +629,7 @@ ol.format.GMLBase.prototype.readFeaturesFromNode = function(node, opt_options) {
     featureNS: this.featureNS
   };
   if (opt_options) {
-    ol.object.assign(options, this.getReadOptions(node, opt_options));
+    ol.obj.assign(options, this.getReadOptions(node, opt_options));
   }
   var features = this.readFeaturesInternal(node, [options]);
   return features || [];

src/ol/format/kml.js

@@ -25,7 +25,7 @@ goog.require('ol.geom.MultiPolygon');
 goog.require('ol.geom.Point');
 goog.require('ol.geom.Polygon');
 goog.require('ol.math');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.proj');
 goog.require('ol.style.Fill');
 goog.require('ol.style.Icon');
@@ -311,7 +311,7 @@ ol.format.KML.createNameStyleFunction_ = function(foundStyle, name) {
       textAlign = 'left';
     }
   }
-  if (!ol.object.isEmpty(foundStyle.getText())) {
+  if (!ol.obj.isEmpty(foundStyle.getText())) {
     textStyle = /** @type {ol.style.Text} */
         (goog.object.clone(foundStyle.getText()));
     textStyle.setText(name);

src/ol/format/osmxml.js

@@ -9,7 +9,7 @@ goog.require('ol.geom.GeometryLayout');
 goog.require('ol.geom.LineString');
 goog.require('ol.geom.Point');
 goog.require('ol.geom.Polygon');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.proj');
 goog.require('ol.xml');
 
@@ -72,7 +72,7 @@ ol.format.OSMXML.readNode_ = function(node, objectStack) {
   var values = ol.xml.pushParseAndPop({
     tags: {}
   }, ol.format.OSMXML.NODE_PARSERS_, node, objectStack);
-  if (!ol.object.isEmpty(values.tags)) {
+  if (!ol.obj.isEmpty(values.tags)) {
     var geometry = new ol.geom.Point(coordinates);
     ol.format.Feature.transformWithOptions(geometry, false, options);
     var feature = new ol.Feature(geometry);

src/ol/format/topojson.js

@@ -9,7 +9,7 @@ goog.require('ol.geom.MultiPoint');
 goog.require('ol.geom.MultiPolygon');
 goog.require('ol.geom.Point');
 goog.require('ol.geom.Polygon');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.proj');
 
 
@@ -297,7 +297,7 @@ ol.format.TopoJSON.prototype.readFeaturesFromObject = function(
     }
     /** @type {Array.<ol.Feature>} */
     var features = [];
-    var topoJSONFeatures = ol.object.getValues(topoJSONTopology.objects);
+    var topoJSONFeatures = ol.obj.getValues(topoJSONTopology.objects);
     var i, ii;
     var feature;
     for (i = 0, ii = topoJSONFeatures.length; i < ii; ++i) {

src/ol/format/wfs.js

@@ -15,7 +15,7 @@ goog.require('ol.format.ogc.filter.IsLike');
 goog.require('ol.format.XMLFeature');
 goog.require('ol.format.XSD');
 goog.require('ol.geom.Geometry');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.proj');
 goog.require('ol.xml');
 
@@ -109,7 +109,7 @@ ol.format.WFS.prototype.readFeaturesFromNode = function(node, opt_options) {
     'featureType': this.featureType_,
     'featureNS': this.featureNS_
   });
-  ol.object.assign(context, this.getReadOptions(node,
+  ol.obj.assign(context, this.getReadOptions(node,
       opt_options ? opt_options : {}));
   var objectStack = [context];
   this.gmlFormat_.FEATURE_COLLECTION_PARSERS[ol.format.GMLBase.GMLNS][
@@ -526,7 +526,7 @@ ol.format.WFS.writeQuery_ = function(node, featureType, objectStack) {
     ol.xml.setAttributeNS(node, ol.format.WFS.XMLNS, 'xmlns:' + featurePrefix,
         featureNS);
   }
-  var item = /** @type {ol.XmlNodeStackItem} */ (ol.object.assign({}, context));
+  var item = /** @type {ol.XmlNodeStackItem} */ (ol.obj.assign({}, context));
   item.node = node;
   ol.xml.pushSerializeAndPop(item,
       ol.format.WFS.QUERY_SERIALIZERS_,
@@ -767,7 +767,7 @@ ol.format.WFS.GETFEATURE_SERIALIZERS_ = {
  */
 ol.format.WFS.writeGetFeature_ = function(node, featureTypes, objectStack) {
   var context = /** @type {Object} */ (objectStack[objectStack.length - 1]);
-  var item = /** @type {ol.XmlNodeStackItem} */ (ol.object.assign({}, context));
+  var item = /** @type {ol.XmlNodeStackItem} */ (ol.obj.assign({}, context));
   item.node = node;
   ol.xml.pushSerializeAndPop(item,
       ol.format.WFS.GETFEATURE_SERIALIZERS_,
@@ -873,7 +873,7 @@ ol.format.WFS.prototype.writeTransaction = function(inserts, updates, deletes,
     obj = {node: node, 'featureNS': options.featureNS,
       'featureType': options.featureType, 'featurePrefix': options.featurePrefix,
       'srsName': options.srsName};
-    ol.object.assign(obj, baseObj);
+    ol.obj.assign(obj, baseObj);
     ol.xml.pushSerializeAndPop(obj,
         ol.format.WFS.TRANSACTION_SERIALIZERS_,
         ol.xml.makeSimpleNodeFactory('Insert'), inserts,
@@ -883,7 +883,7 @@ ol.format.WFS.prototype.writeTransaction = function(inserts, updates, deletes,
     obj = {node: node, 'featureNS': options.featureNS,
       'featureType': options.featureType, 'featurePrefix': options.featurePrefix,
       'srsName': options.srsName};
-    ol.object.assign(obj, baseObj);
+    ol.obj.assign(obj, baseObj);
     ol.xml.pushSerializeAndPop(obj,
         ol.format.WFS.TRANSACTION_SERIALIZERS_,
         ol.xml.makeSimpleNodeFactory('Update'), updates,

src/ol/format/wmsgetfeatureinfo.js

@@ -3,7 +3,7 @@ goog.provide('ol.format.WMSGetFeatureInfo');
 goog.require('ol.array');
 goog.require('ol.format.GML2');
 goog.require('ol.format.XMLFeature');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.xml');
 
 
@@ -147,7 +147,7 @@ ol.format.WMSGetFeatureInfo.prototype.readFeatures;
 ol.format.WMSGetFeatureInfo.prototype.readFeaturesFromNode = function(node, opt_options) {
   var options = {};
   if (opt_options) {
-    ol.object.assign(options, this.getReadOptions(node, opt_options));
+    ol.obj.assign(options, this.getReadOptions(node, opt_options));
   }
   return this.readFeatures_(node, [options]);
 };

src/ol/geom/geometrycollection.js

@@ -5,7 +5,7 @@ goog.require('ol.events.EventType');
 goog.require('ol.extent');
 goog.require('ol.geom.Geometry');
 goog.require('ol.geom.GeometryType');
-goog.require('ol.object');
+goog.require('ol.obj');
 
 
 /**
@@ -160,7 +160,7 @@ ol.geom.GeometryCollection.prototype.getGeometriesArray = function() {
  */
 ol.geom.GeometryCollection.prototype.getSimplifiedGeometry = function(squaredTolerance) {
   if (this.simplifiedGeometryRevision != this.getRevision()) {
-    ol.object.clear(this.simplifiedGeometryCache);
+    ol.obj.clear(this.simplifiedGeometryCache);
     this.simplifiedGeometryMaxMinSquaredTolerance = 0;
     this.simplifiedGeometryRevision = this.getRevision();
   }

src/ol/geom/simplegeometry.js

@@ -5,7 +5,7 @@ goog.require('ol.extent');
 goog.require('ol.geom.Geometry');
 goog.require('ol.geom.GeometryLayout');
 goog.require('ol.geom.flat.transform');
-goog.require('ol.object');
+goog.require('ol.obj');
 
 
 /**
@@ -146,7 +146,7 @@ ol.geom.SimpleGeometry.prototype.getLayout = function() {
  */
 ol.geom.SimpleGeometry.prototype.getSimplifiedGeometry = function(squaredTolerance) {
   if (this.simplifiedGeometryRevision != this.getRevision()) {
-    ol.object.clear(this.simplifiedGeometryCache);
+    ol.obj.clear(this.simplifiedGeometryCache);
     this.simplifiedGeometryMaxMinSquaredTolerance = 0;
     this.simplifiedGeometryRevision = this.getRevision();
   }

src/ol/image.js

@@ -5,7 +5,7 @@ goog.require('ol.ImageState');
 goog.require('ol.events');
 goog.require('ol.events.EventType');
 goog.require('ol.extent');
-goog.require('ol.object');
+goog.require('ol.obj');
 
 
 /**
@@ -80,7 +80,7 @@ ol.Image.prototype.getImage = function(opt_context) {
     var key = ol.getUid(opt_context);
     if (key in this.imageByContext_) {
       return this.imageByContext_[key];
-    } else if (ol.object.isEmpty(this.imageByContext_)) {
+    } else if (ol.obj.isEmpty(this.imageByContext_)) {
       image = this.image_;
     } else {
       image = /** @type {Image} */ (this.image_.cloneNode(false));

src/ol/imagetile.js

@@ -4,7 +4,7 @@ goog.require('ol.Tile');
 goog.require('ol.TileState');
 goog.require('ol.events');
 goog.require('ol.events.EventType');
-goog.require('ol.object');
+goog.require('ol.obj');
 
 
 /**
@@ -86,7 +86,7 @@ ol.ImageTile.prototype.getImage = function(opt_context) {
     var key = ol.getUid(opt_context);
     if (key in this.imageByContext_) {
       return this.imageByContext_[key];
-    } else if (ol.object.isEmpty(this.imageByContext_)) {
+    } else if (ol.obj.isEmpty(this.imageByContext_)) {
       image = this.image_;
     } else {
       image = /** @type {Image} */ (this.image_.cloneNode(false));

src/ol/interaction/pointer.js

@@ -4,7 +4,7 @@ goog.require('ol');
 goog.require('ol.MapBrowserEvent.EventType');
 goog.require('ol.MapBrowserPointerEvent');
 goog.require('ol.interaction.Interaction');
-goog.require('ol.object');
+goog.require('ol.obj');
 
 
 /**
@@ -131,7 +131,7 @@ ol.interaction.Pointer.prototype.updateTrackedPointers_ = function(mapBrowserEve
       // update only when there was a pointerdown event for this pointer
       this.trackedPointers_[event.pointerId] = event;
     }
-    this.targetPointers = ol.object.getValues(this.trackedPointers_);
+    this.targetPointers = ol.obj.getValues(this.trackedPointers_);
   }
 };
 

src/ol/interaction/select.js

@@ -12,7 +12,7 @@ goog.require('ol.events.condition');
 goog.require('ol.geom.GeometryType');
 goog.require('ol.interaction.Interaction');
 goog.require('ol.layer.Vector');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.source.Vector');
 
 
@@ -256,7 +256,7 @@ ol.interaction.Select.handleEvent = function(mapBrowserEvent) {
     // Replace the currently selected feature(s) with the feature(s) at the
     // pixel, or clear the selected feature(s) if there is no feature at
     // the pixel.
-    ol.object.clear(this.featureLayerAssociation_);
+    ol.obj.clear(this.featureLayerAssociation_);
     map.forEachFeatureAtPixel(mapBrowserEvent.pixel,
         /**
          * @param {ol.Feature|ol.render.Feature} feature Feature.

src/ol/interaction/snap.js

@@ -13,7 +13,7 @@ goog.require('ol.extent');
 goog.require('ol.geom.Geometry');
 goog.require('ol.interaction.Pointer');
 goog.require('ol.functions');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.source.Vector');
 goog.require('ol.source.VectorEvent');
 goog.require('ol.source.VectorEventType');
@@ -605,7 +605,7 @@ ol.interaction.Snap.handleEvent_ = function(evt) {
  * @private
  */
 ol.interaction.Snap.handleUpEvent_ = function(evt) {
-  var featuresToUpdate = ol.object.getValues(this.pendingFeatures_);
+  var featuresToUpdate = ol.obj.getValues(this.pendingFeatures_);
   if (featuresToUpdate.length) {
     featuresToUpdate.forEach(this.updateFeature_, this);
     this.pendingFeatures_ = {};

src/ol/layer/base.js

@@ -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] =

src/ol/layer/group.js

@@ -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;

src/ol/layer/heatmap.js

@@ -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;

src/ol/layer/layer.js

@@ -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));

src/ol/layer/tile.js

@@ -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;

src/ol/layer/vector.js

@@ -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;

src/ol/layer/vectortile.js

@@ -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;

src/ol/map.js

@@ -30,7 +30,7 @@ goog.require('ol.has');
 goog.require('ol.interaction');
 goog.require('ol.layer.Group');
 goog.require('ol.transform');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.proj');
 goog.require('ol.proj.common');
 goog.require('ol.renderer.Map');
@@ -1258,7 +1258,7 @@ ol.Map.prototype.renderFrame_ = function(time) {
       index: this.frameIndex_++,
       layerStates: layerStates,
       layerStatesArray: layerStatesArray,
-      logos: ol.object.assign({}, this.logos_),
+      logos: ol.obj.assign({}, this.logos_),
       pixelRatio: this.pixelRatio_,
       pixelToCoordinateTransform: this.pixelToCoordinateTransform_,
       postRenderFunctions: [],

src/ol/obj.js

@@ -1,4 +1,4 @@
-goog.provide('ol.object');
+goog.provide('ol.obj');
 
 
 /**
@@ -10,7 +10,7 @@ goog.provide('ol.object');
  * @param {...Object} var_sources The source object(s).
  * @return {!Object} The modified target object.
  */
-ol.object.assign = (typeof Object.assign === 'function') ? Object.assign : function(target, var_sources) {
+ol.obj.assign = (typeof Object.assign === 'function') ? Object.assign : function(target, var_sources) {
   if (target === undefined || target === null) {
     throw new TypeError('Cannot convert undefined or null to object');
   }
@@ -34,7 +34,7 @@ ol.object.assign = (typeof Object.assign === 'function') ? Object.assign : funct
  * Removes all properties from an object.
  * @param {Object} object The object to clear.
  */
-ol.object.clear = function(object) {
+ol.obj.clear = function(object) {
   for (var property in object) {
     delete object[property];
   }
@@ -47,7 +47,7 @@ ol.object.clear = function(object) {
  * @return {!Array<V>} The property values.
  * @template K,V
  */
-ol.object.getValues = function(object) {
+ol.obj.getValues = function(object) {
   var values = [];
   for (var property in object) {
     values.push(object[property]);
@@ -61,7 +61,7 @@ ol.object.getValues = function(object) {
  * @param {Object} object The object to check.
  * @return {boolean} The object is empty.
  */
-ol.object.isEmpty = function(object) {
+ol.obj.isEmpty = function(object) {
   var property;
   for (property in object) {
     return false;

src/ol/object.js

@@ -5,7 +5,7 @@ goog.provide('ol.ObjectEventType');
 goog.require('ol.Observable');
 goog.require('ol.events');
 goog.require('ol.events.Event');
-goog.require('ol.object');
+goog.require('ol.obj');
 
 
 /**
@@ -170,7 +170,7 @@ ol.Object.prototype.getKeys = function() {
  * @api stable
  */
 ol.Object.prototype.getProperties = function() {
-  return ol.object.assign({}, this.values_);
+  return ol.obj.assign({}, this.values_);
 };
 
 

src/ol/proj/index.js

@@ -5,7 +5,7 @@ goog.provide('ol.proj.Units');
 
 goog.require('ol');
 goog.require('ol.extent');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.sphere.NORMAL');
 
 
@@ -614,7 +614,7 @@ ol.proj.removeTransform = function(source, destination) {
       'destinationCode should be in transforms of sourceCode');
   var transform = transforms[sourceCode][destinationCode];
   delete transforms[sourceCode][destinationCode];
-  if (ol.object.isEmpty(transforms[sourceCode])) {
+  if (ol.obj.isEmpty(transforms[sourceCode])) {
     delete transforms[sourceCode];
   }
   return transform;

src/ol/render/canvas/replay.js

@@ -19,7 +19,7 @@ goog.require('ol.extent.Relationship');
 goog.require('ol.geom.flat.simplify');
 goog.require('ol.geom.flat.transform');
 goog.require('ol.has');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.render.IReplayGroup');
 goog.require('ol.render.VectorContext');
 goog.require('ol.render.canvas');
@@ -248,7 +248,7 @@ ol.render.canvas.Replay.prototype.replay_ = function(
     goog.DEBUG && console.assert(pixelCoordinates === this.pixelCoordinates_,
         'pixelCoordinates should be the same as this.pixelCoordinates_');
   }
-  var skipFeatures = !ol.object.isEmpty(skippedFeaturesHash);
+  var skipFeatures = !ol.obj.isEmpty(skippedFeaturesHash);
   var i = 0; // instruction index
   var ii = instructions.length; // end of instructions
   var d = 0; // data index
@@ -1957,7 +1957,7 @@ ol.render.canvas.ReplayGroup.prototype.getReplay = function(zIndex, replayType)
  * @inheritDoc
  */
 ol.render.canvas.ReplayGroup.prototype.isEmpty = function() {
-  return ol.object.isEmpty(this.replaysByZIndex_);
+  return ol.obj.isEmpty(this.replaysByZIndex_);
 };
 
 

src/ol/render/webgl/imagereplay.js

@@ -3,7 +3,7 @@ goog.provide('ol.render.webgl.ReplayGroup');
 
 goog.require('ol.transform');
 goog.require('ol.extent');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.render.IReplayGroup');
 goog.require('ol.render.VectorContext');
 goog.require('ol.render.webgl.imagereplay.shader.Default');
@@ -617,7 +617,7 @@ ol.render.webgl.ImageReplay.prototype.drawReplay_ = function(gl, context, skippe
       ol.webgl.UNSIGNED_INT : ol.webgl.UNSIGNED_SHORT;
   var elementSize = context.hasOESElementIndexUint ? 4 : 2;
 
-  if (!ol.object.isEmpty(skippedFeaturesHash)) {
+  if (!ol.obj.isEmpty(skippedFeaturesHash)) {
     this.drawReplaySkipping_(
         gl, skippedFeaturesHash, textures, groupIndices,
         elementType, elementSize);
@@ -998,7 +998,7 @@ ol.render.webgl.ReplayGroup.prototype.getReplay = function(zIndex, replayType) {
  * @inheritDoc
  */
 ol.render.webgl.ReplayGroup.prototype.isEmpty = function() {
-  return ol.object.isEmpty(this.replays_);
+  return ol.obj.isEmpty(this.replays_);
 };
 
 

src/ol/reproj/tile.js

@@ -6,7 +6,7 @@ goog.require('ol.events');
 goog.require('ol.events.EventType');
 goog.require('ol.extent');
 goog.require('ol.math');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.proj');
 goog.require('ol.reproj');
 goog.require('ol.reproj.Triangulation');
@@ -223,7 +223,7 @@ ol.reproj.Tile.prototype.getImage = function(opt_context) {
     var key = ol.getUid(opt_context);
     if (key in this.canvasByContext_) {
       return this.canvasByContext_[key];
-    } else if (ol.object.isEmpty(this.canvasByContext_)) {
+    } else if (ol.obj.isEmpty(this.canvasByContext_)) {
       image = this.canvas_;
     } else {
       image = /** @type {HTMLCanvasElement} */ (this.canvas_.cloneNode(false));

src/ol/source/cartodb.js

@@ -1,6 +1,6 @@
 goog.provide('ol.source.CartoDB');
 
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.source.State');
 goog.require('ol.source.XYZ');
 
@@ -73,7 +73,7 @@ ol.source.CartoDB.prototype.getConfig = function() {
  * @api
  */
 ol.source.CartoDB.prototype.updateConfig = function(config) {
-  ol.object.assign(this.config_, config);
+  ol.obj.assign(this.config_, config);
   this.initializeMap_();
 };
 

src/ol/source/imagearcgisrest.js

@@ -5,7 +5,7 @@ goog.require('ol.Image');
 goog.require('ol.events');
 goog.require('ol.events.EventType');
 goog.require('ol.extent');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.proj');
 goog.require('ol.source.Image');
 goog.require('ol.uri');
@@ -129,7 +129,7 @@ ol.source.ImageArcGISRest.prototype.getImageInternal = function(extent, resoluti
     'FORMAT': 'PNG32',
     'TRANSPARENT': true
   };
-  ol.object.assign(params, this.params_);
+  ol.obj.assign(params, this.params_);
 
   extent = extent.slice();
   var centerX = (extent[0] + extent[2]) / 2;
@@ -260,7 +260,7 @@ ol.source.ImageArcGISRest.prototype.setUrl = function(url) {
  * @api stable
  */
 ol.source.ImageArcGISRest.prototype.updateParams = function(params) {
-  ol.object.assign(this.params_, params);
+  ol.obj.assign(this.params_, params);
   this.image_ = null;
   this.changed();
 };

src/ol/source/imagemapguide.js

@@ -4,7 +4,7 @@ goog.require('ol.events');
 goog.require('ol.events.EventType');
 goog.require('ol.Image');
 goog.require('ol.extent');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.source.Image');
 goog.require('ol.uri');
 
@@ -191,7 +191,7 @@ ol.source.ImageMapGuide.getScale = function(extent, size, metersPerUnit, dpi) {
  * @api stable
  */
 ol.source.ImageMapGuide.prototype.updateParams = function(params) {
-  ol.object.assign(this.params_, params);
+  ol.obj.assign(this.params_, params);
   this.changed();
 };
 
@@ -221,7 +221,7 @@ ol.source.ImageMapGuide.prototype.getUrl = function(baseUrl, params, extent, siz
     'SETVIEWCENTERX': center[0],
     'SETVIEWCENTERY': center[1]
   };
-  ol.object.assign(baseParams, params);
+  ol.obj.assign(baseParams, params);
   return ol.uri.appendParams(baseUrl, baseParams);
 };
 

src/ol/source/imagewms.js

@@ -7,7 +7,7 @@ goog.require('ol.Image');
 goog.require('ol.events');
 goog.require('ol.events.EventType');
 goog.require('ol.extent');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.proj');
 goog.require('ol.source.Image');
 goog.require('ol.source.wms');
@@ -154,7 +154,7 @@ ol.source.ImageWMS.prototype.getGetFeatureInfoUrl = function(coordinate, resolut
     'TRANSPARENT': true,
     'QUERY_LAYERS': this.params_['LAYERS']
   };
-  ol.object.assign(baseParams, this.params_, params);
+  ol.obj.assign(baseParams, this.params_, params);
 
   var x = Math.floor((coordinate[0] - extent[0]) / resolution);
   var y = Math.floor((extent[3] - coordinate[1]) / resolution);
@@ -226,7 +226,7 @@ ol.source.ImageWMS.prototype.getImageInternal = function(extent, resolution, pix
     'FORMAT': 'image/png',
     'TRANSPARENT': true
   };
-  ol.object.assign(params, this.params_);
+  ol.obj.assign(params, this.params_);
 
   this.imageSize_[0] = Math.ceil(imageWidth * this.ratio_);
   this.imageSize_[1] = Math.ceil(imageHeight * this.ratio_);
@@ -358,7 +358,7 @@ ol.source.ImageWMS.prototype.setUrl = function(url) {
  * @api stable
  */
 ol.source.ImageWMS.prototype.updateParams = function(params) {
-  ol.object.assign(this.params_, params);
+  ol.obj.assign(this.params_, params);
   this.updateV13_();
   this.image_ = null;
   this.changed();

src/ol/source/raster.js

@@ -14,7 +14,7 @@ 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.obj');
 goog.require('ol.renderer.canvas.ImageLayer');
 goog.require('ol.renderer.canvas.TileLayer');
 goog.require('ol.source.Image');
@@ -181,10 +181,10 @@ ol.source.Raster.prototype.setOperation = function(operation, opt_lib) {
 ol.source.Raster.prototype.updateFrameState_ = function(extent, resolution, projection) {
 
   var frameState = /** @type {olx.FrameState} */ (
-      ol.object.assign({}, this.frameState_));
+      ol.obj.assign({}, this.frameState_));
 
   frameState.viewState = /** @type {olx.ViewState} */ (
-      ol.object.assign({}, frameState.viewState));
+      ol.obj.assign({}, frameState.viewState));
 
   var center = ol.extent.getCenter(extent);
   var width = Math.round(ol.extent.getWidth(extent) / resolution);

src/ol/source/tilearcgisrest.js

@@ -2,7 +2,7 @@ goog.provide('ol.source.TileArcGISRest');
 
 goog.require('ol');
 goog.require('ol.extent');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.math');
 goog.require('ol.proj');
 goog.require('ol.size');
@@ -154,7 +154,7 @@ ol.source.TileArcGISRest.prototype.fixedTileUrlFunction = function(tileCoord, pi
     'FORMAT': 'PNG32',
     'TRANSPARENT': true
   };
-  ol.object.assign(baseParams, this.params_);
+  ol.obj.assign(baseParams, this.params_);
 
   return this.getRequestUrl_(tileCoord, tileSize, tileExtent,
       pixelRatio, projection, baseParams);
@@ -167,6 +167,6 @@ ol.source.TileArcGISRest.prototype.fixedTileUrlFunction = function(tileCoord, pi
  * @api stable
  */
 ol.source.TileArcGISRest.prototype.updateParams = function(params) {
-  ol.object.assign(this.params_, params);
+  ol.obj.assign(this.params_, params);
   this.changed();
 };

src/ol/source/tilewms.js

@@ -6,7 +6,7 @@ goog.provide('ol.source.TileWMS');
 
 goog.require('ol');
 goog.require('ol.extent');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.math');
 goog.require('ol.proj');
 goog.require('ol.size');
@@ -153,7 +153,7 @@ ol.source.TileWMS.prototype.getGetFeatureInfoUrl = function(coordinate, resoluti
     'TRANSPARENT': true,
     'QUERY_LAYERS': this.params_['LAYERS']
   };
-  ol.object.assign(baseParams, this.params_, params);
+  ol.obj.assign(baseParams, this.params_, params);
 
   var x = Math.floor((coordinate[0] - tileExtent[0]) / tileResolution);
   var y = Math.floor((tileExtent[3] - coordinate[1]) / tileResolution);
@@ -348,7 +348,7 @@ ol.source.TileWMS.prototype.fixedTileUrlFunction = function(tileCoord, pixelRati
     'FORMAT': 'image/png',
     'TRANSPARENT': true
   };
-  ol.object.assign(baseParams, this.params_);
+  ol.obj.assign(baseParams, this.params_);
 
   return this.getRequestUrl_(tileCoord, tileSize, tileExtent,
       pixelRatio, projection, baseParams);
@@ -369,7 +369,7 @@ ol.source.TileWMS.prototype.setUrls = function(urls) {
  * @api stable
  */
 ol.source.TileWMS.prototype.updateParams = function(params) {
-  ol.object.assign(this.params_, params);
+  ol.obj.assign(this.params_, params);
   this.resetCoordKeyPrefix_();
   this.updateV13_();
   this.setKey(this.getKeyForParams_());

src/ol/source/vector.js

@@ -16,7 +16,7 @@ goog.require('ol.events.EventType');
 goog.require('ol.extent');
 goog.require('ol.featureloader');
 goog.require('ol.loadingstrategy');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.proj');
 goog.require('ol.source.Source');
 goog.require('ol.source.State');
@@ -394,11 +394,11 @@ ol.source.Vector.prototype.clear = function(opt_fast) {
   if (this.featuresCollection_) {
     this.featuresCollection_.clear();
   }
-  goog.DEBUG && console.assert(ol.object.isEmpty(this.featureChangeKeys_),
+  goog.DEBUG && console.assert(ol.obj.isEmpty(this.featureChangeKeys_),
       'featureChangeKeys is an empty object now');
-  goog.DEBUG && console.assert(ol.object.isEmpty(this.idIndex_),
+  goog.DEBUG && console.assert(ol.obj.isEmpty(this.idIndex_),
       'idIndex is an empty object now');
-  goog.DEBUG && console.assert(ol.object.isEmpty(this.undefIdIndex_),
+  goog.DEBUG && console.assert(ol.obj.isEmpty(this.undefIdIndex_),
       'undefIdIndex is an empty object now');
 
   if (this.featuresRtree_) {
@@ -552,9 +552,9 @@ ol.source.Vector.prototype.getFeatures = function() {
     features = this.featuresCollection_.getArray();
   } else if (this.featuresRtree_) {
     features = this.featuresRtree_.getAll();
-    if (!ol.object.isEmpty(this.nullGeometryFeatures_)) {
+    if (!ol.obj.isEmpty(this.nullGeometryFeatures_)) {
       ol.array.extend(
-          features, ol.object.getValues(this.nullGeometryFeatures_));
+          features, ol.obj.getValues(this.nullGeometryFeatures_));
     }
   }
   return /** @type {Array.<ol.Feature>} */ (features);
@@ -771,7 +771,7 @@ ol.source.Vector.prototype.handleFeatureChange_ = function(event) {
  */
 ol.source.Vector.prototype.isEmpty = function() {
   return this.featuresRtree_.isEmpty() &&
-      ol.object.isEmpty(this.nullGeometryFeatures_);
+      ol.obj.isEmpty(this.nullGeometryFeatures_);
 };
 
 

src/ol/source/wmts.js

@@ -4,7 +4,7 @@ goog.provide('ol.source.WMTSRequestEncoding');
 goog.require('ol.TileUrlFunction');
 goog.require('ol.array');
 goog.require('ol.extent');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.proj');
 goog.require('ol.source.TileImage');
 goog.require('ol.tilegrid.WMTS');
@@ -101,7 +101,7 @@ ol.source.WMTS = function(options) {
   };
 
   if (requestEncoding == ol.source.WMTSRequestEncoding.KVP) {
-    ol.object.assign(context, {
+    ol.obj.assign(context, {
       'Service': 'WMTS',
       'Request': 'GetTile',
       'Version': this.version_,
@@ -143,7 +143,7 @@ ol.source.WMTS = function(options) {
               'TileCol': tileCoord[1],
               'TileRow': -tileCoord[2] - 1
             };
-            ol.object.assign(localContext, dimensions);
+            ol.obj.assign(localContext, dimensions);
             var url = template;
             if (requestEncoding == ol.source.WMTSRequestEncoding.KVP) {
               url = ol.uri.appendParams(url, localContext);
@@ -276,7 +276,7 @@ ol.source.WMTS.prototype.getKeyForDimensions_ = function() {
  * @api
  */
 ol.source.WMTS.prototype.updateDimensions = function(dimensions) {
-  ol.object.assign(this.dimensions_, dimensions);
+  ol.obj.assign(this.dimensions_, dimensions);
   this.setKey(this.getKeyForDimensions_());
 };
 

src/ol/structs/lrucache.js

@@ -1,6 +1,6 @@
 goog.provide('ol.structs.LRUCache');
 
-goog.require('ol.object');
+goog.require('ol.obj');
 
 
 /**
@@ -46,7 +46,7 @@ if (goog.DEBUG) {
    */
   ol.structs.LRUCache.prototype.assertValid = function() {
     if (this.count_ === 0) {
-      console.assert(ol.object.isEmpty(this.entries_),
+      console.assert(ol.obj.isEmpty(this.entries_),
           'entries must be an empty object (count = 0)');
       console.assert(!this.oldest_,
           'oldest must be null (count = 0)');

src/ol/structs/priorityqueue.js

@@ -1,6 +1,6 @@
 goog.provide('ol.structs.PriorityQueue');
 
-goog.require('ol.object');
+goog.require('ol.obj');
 
 
 /**
@@ -89,7 +89,7 @@ if (goog.DEBUG) {
 ol.structs.PriorityQueue.prototype.clear = function() {
   this.elements_.length = 0;
   this.priorities_.length = 0;
-  ol.object.clear(this.queuedElements_);
+  ol.obj.clear(this.queuedElements_);
 };
 
 

src/ol/structs/rbush.js

@@ -2,7 +2,7 @@ goog.provide('ol.structs.RBush');
 
 goog.require('ol.ext.rbush');
 goog.require('ol.extent');
-goog.require('ol.object');
+goog.require('ol.obj');
 
 
 /**
@@ -243,7 +243,7 @@ ol.structs.RBush.prototype.forEach_ = function(values, callback, opt_this) {
  * @return {boolean} Is empty.
  */
 ol.structs.RBush.prototype.isEmpty = function() {
-  return ol.object.isEmpty(this.items_);
+  return ol.obj.isEmpty(this.items_);
 };
 
 

src/ol/tilegrid/tilegrid.js

@@ -6,7 +6,7 @@ goog.require('ol.array');
 goog.require('ol.extent');
 goog.require('ol.extent.Corner');
 goog.require('ol.math');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.proj');
 goog.require('ol.proj.METERS_PER_UNIT');
 goog.require('ol.proj.Projection');
@@ -558,7 +558,7 @@ ol.tilegrid.createForExtent = function(extent, opt_maxZoom, opt_tileSize, opt_co
  */
 ol.tilegrid.createXYZ = function(opt_options) {
   var options = /** @type {olx.tilegrid.TileGridOptions} */ ({});
-  ol.object.assign(options, opt_options !== undefined ?
+  ol.obj.assign(options, opt_options !== undefined ?
       opt_options : /** @type {olx.tilegrid.XYZOptions} */ ({}));
   if (options.extent === undefined) {
     options.extent = ol.proj.get('EPSG:3857').getExtent();

src/ol/webgl/context.js

@@ -4,7 +4,7 @@ goog.require('ol');
 goog.require('ol.Disposable');
 goog.require('ol.array');
 goog.require('ol.events');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.webgl');
 goog.require('ol.webgl.Buffer');
 goog.require('ol.webgl.WebGLContextEventType');
@@ -263,9 +263,9 @@ ol.webgl.Context.prototype.getProgram = function(
  * FIXME empy description for jsdoc
  */
 ol.webgl.Context.prototype.handleWebGLContextLost = function() {
-  ol.object.clear(this.bufferCache_);
+  ol.obj.clear(this.bufferCache_);
-  ol.object.clear(this.shaderCache_);
+  ol.obj.clear(this.shaderCache_);
-  ol.object.clear(this.programCache_);
+  ol.obj.clear(this.programCache_);
   this.currentProgram_ = null;
   this.hitDetectionFramebuffer_ = null;
   this.hitDetectionTexture_ = null;

test/spec/ol/feature.test.js

@@ -81,7 +81,7 @@ describe('ol.Feature', function() {
     it('is empty by default', function() {
       var feature = new ol.Feature();
       var properties = feature.getProperties();
-      expect(ol.object.isEmpty(properties)).to.be(true);
+      expect(ol.obj.isEmpty(properties)).to.be(true);
     });
 
   });
@@ -464,5 +464,5 @@ describe('ol.Feature.createStyleFunction()', function() {
 
 goog.require('ol.Feature');
 goog.require('ol.geom.Point');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.style.Style');

test/spec/ol/layer/group.test.js

@@ -364,9 +364,9 @@ describe('ol.layer.Group', function() {
       expect(layerStatesArray[0]).to.eql(layer1.getLayerState());
 
       // layer state should match except for layer reference
-      var layerState = ol.object.assign({}, layerStatesArray[0]);
+      var layerState = ol.obj.assign({}, layerStatesArray[0]);
       delete layerState.layer;
-      var groupState = ol.object.assign({}, layerGroup.getLayerState());
+      var groupState = ol.obj.assign({}, layerGroup.getLayerState());
       delete groupState.layer;
       expect(layerState).to.eql(groupState);
 
@@ -413,14 +413,14 @@ describe('ol.layer.Group', function() {
       var groupState, layerState;
 
       // layer state should match except for layer reference
-      layerState = ol.object.assign({}, layerStatesArray[0]);
+      layerState = ol.obj.assign({}, layerStatesArray[0]);
       delete layerState.layer;
-      groupState = ol.object.assign({}, layerGroup.getLayerState());
+      groupState = ol.obj.assign({}, layerGroup.getLayerState());
       delete groupState.layer;
       expect(layerState).to.eql(groupState);
 
       // layer state should be transformed (and we ignore layer reference)
-      layerState = ol.object.assign({}, layerStatesArray[1]);
+      layerState = ol.obj.assign({}, layerStatesArray[1]);
       delete layerState.layer;
       expect(layerState).to.eql({
         opacity: 0.25,
@@ -495,6 +495,6 @@ goog.require('ol.events');
 goog.require('ol.extent');
 goog.require('ol.layer.Group');
 goog.require('ol.layer.Layer');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.renderer.Map');
 goog.require('ol.source.Source');

test/spec/ol/objectutil.test.js

@@ -1,10 +1,10 @@
 goog.provide('ol.test.object');
 
-describe('ol.object.assign()', function() {
+describe('ol.obj.assign()', function() {
 
   it('is an alias for Object.assign() where available', function() {
     if (typeof Object.assign === 'function') {
-      expect(ol.object.assign).to.be(Object.assign);
+      expect(ol.obj.assign).to.be(Object.assign);
     }
   });
 
@@ -20,7 +20,7 @@ describe('ol.object.assign()', function() {
       targetProp1: 'targetValue1'
     };
 
-    var assigned = ol.object.assign(target, source);
+    var assigned = ol.obj.assign(target, source);
     expect(assigned).to.be(target);
     expect(assigned.sourceProp1).to.be('sourceValue1');
     expect(assigned.sourceProp2).to.be('sourceValue2');
@@ -30,11 +30,11 @@ describe('ol.object.assign()', function() {
 
 });
 
-describe('ol.object.clear()', function() {
+describe('ol.obj.clear()', function() {
 
   it('removes all properties from an object', function() {
-    var clear = ol.object.clear;
+    var clear = ol.obj.clear;
-    var isEmpty = ol.object.isEmpty;
+    var isEmpty = ol.obj.isEmpty;
     expect(isEmpty(clear({foo: 'bar'}))).to.be(true);
     expect(isEmpty(clear({foo: 'bar', num: 42}))).to.be(true);
     expect(isEmpty(clear({}))).to.be(true);
@@ -43,24 +43,24 @@ describe('ol.object.clear()', function() {
 
 });
 
-describe('ol.object.getValues()', function() {
+describe('ol.obj.getValues()', function() {
 
   it('gets a list of property values from an object', function() {
-    expect(ol.object.getValues({foo: 'bar', num: 42}).sort()).to.eql([42, 'bar']);
+    expect(ol.obj.getValues({foo: 'bar', num: 42}).sort()).to.eql([42, 'bar']);
-    expect(ol.object.getValues(null)).to.eql([]);
+    expect(ol.obj.getValues(null)).to.eql([]);
   });
 
 });
 
-describe('ol.object.isEmpty()', function() {
+describe('ol.obj.isEmpty()', function() {
 
   it('checks if an object has any properties', function() {
-    expect(ol.object.isEmpty({})).to.be(true);
+    expect(ol.obj.isEmpty({})).to.be(true);
-    expect(ol.object.isEmpty(null)).to.be(true);
+    expect(ol.obj.isEmpty(null)).to.be(true);
-    expect(ol.object.isEmpty({foo: 'bar'})).to.be(false);
+    expect(ol.obj.isEmpty({foo: 'bar'})).to.be(false);
-    expect(ol.object.isEmpty({foo: false})).to.be(false);
+    expect(ol.obj.isEmpty({foo: false})).to.be(false);
   });
 
 });
 
-goog.require('ol.object');
+goog.require('ol.obj');

test/spec/ol/pointer/touchsource.test.js

@@ -119,7 +119,7 @@ describe('ol.pointer.TouchSource', function() {
     touches = touches !== undefined ? touches : changedTouches;
 
     var event = new ol.events.Event(type);
-    ol.object.assign(event, {
+    ol.obj.assign(event, {
       touches: touches,
       changedTouches: changedTouches
     });
@@ -131,7 +131,7 @@ goog.require('ol.events');
 goog.require('ol.events.Event');
 goog.require('ol.events.EventTarget');
 goog.require('ol.has');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.pointer.PointerEvent');
 goog.require('ol.pointer.PointerEventHandler');
 goog.require('ol.pointer.TouchSource');

test_rendering/spec/ol/layer/image.test.js

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

test_rendering/spec/ol/layer/tile.test.js

@@ -44,7 +44,7 @@ describe('ol.rendering.layer.Tile', function() {
       var options = {
         source: source
       };
-      ol.object.assign(options, layerOptions[i] || layerOptions);
+      ol.obj.assign(options, layerOptions[i] || layerOptions);
       map.addLayer(new ol.layer.Tile(options));
     });
   }
@@ -252,7 +252,7 @@ goog.require('ol.Map');
 goog.require('ol.View');
 goog.require('ol.geom.Point');
 goog.require('ol.layer.Tile');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.proj');
 goog.require('ol.source.TileImage');
 goog.require('ol.source.XYZ');

test_rendering/spec/ol/layer/vectortile.test.js

@@ -42,7 +42,7 @@ describe('ol.rendering.layer.VectorTile', function() {
     var options = {
       source: source
     };
-    ol.object.assign(options, layerOptions);
+    ol.obj.assign(options, layerOptions);
     map.addLayer(new ol.layer.VectorTile(options));
   }
 
@@ -78,5 +78,5 @@ 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.obj');
 goog.require('ol.source.VectorTile');