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

Replace goog.object.isEmpty() with ol.object.isEmpty()

Browse Source
This commit is contained in:
Tim Schaub
2016-02-03 21:17:32 -07:00
parent 0dce343d4f
commit 8aecb3270c
17 changed files with 71 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ol/source/vectorsource.js
View File

@@ -22,6 +22,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.proj');
goog.require('ol.source.Source');
goog.require('ol.source.State');
@@ -392,11 +393,11 @@ ol.source.Vector.prototype.clear = function(opt_fast) {
if (this.featuresCollection_) {
this.featuresCollection_.clear();
}
goog.asserts.assert(goog.object.isEmpty(this.featureChangeKeys_),
goog.asserts.assert(ol.object.isEmpty(this.featureChangeKeys_),
'featureChangeKeys is an empty object now');
goog.asserts.assert(goog.object.isEmpty(this.idIndex_),
goog.asserts.assert(ol.object.isEmpty(this.idIndex_),
'idIndex is an empty object now');
goog.asserts.assert(goog.object.isEmpty(this.undefIdIndex_),
goog.asserts.assert(ol.object.isEmpty(this.undefIdIndex_),
'undefIdIndex is an empty object now');
if (this.featuresRtree_) {
@@ -550,7 +551,7 @@ ol.source.Vector.prototype.getFeatures = function() {
features = this.featuresCollection_.getArray();
} else if (this.featuresRtree_) {
features = this.featuresRtree_.getAll();
if (!goog.object.isEmpty(this.nullGeometryFeatures_)) {
if (!ol.object.isEmpty(this.nullGeometryFeatures_)) {
ol.array.extend(
features, goog.object.getValues(this.nullGeometryFeatures_));
}
@@ -753,7 +754,7 @@ ol.source.Vector.prototype.hasFeature = function(feature) {
*/
ol.source.Vector.prototype.isEmpty = function() {
return this.featuresRtree_.isEmpty() &&
goog.object.isEmpty(this.nullGeometryFeatures_);
ol.object.isEmpty(this.nullGeometryFeatures_);
};