Remove use of goog.object.contains() and findKey()

This commit is contained in:
Tim Schaub
2016-02-03 10:19:47 -07:00
parent 554887ae14
commit 1a9367228d

View File

@@ -5,7 +5,6 @@ goog.provide('ol.format.GMLBase');
goog.require('goog.asserts');
goog.require('goog.dom.NodeType');
goog.require('goog.object');
goog.require('goog.string');
goog.require('ol.array');
goog.require('ol.Feature');
@@ -123,14 +122,19 @@ ol.format.GMLBase.prototype.readFeaturesInternal = function(node, objectStack) {
if (child.nodeType === 1) {
var ft = child.nodeName.split(':').pop();
if (featureType.indexOf(ft) === -1) {
var key;
if (!goog.object.contains(featureNS, child.namespaceURI)) {
key = prefix + goog.object.getCount(featureNS);
featureNS[key] = child.namespaceURI;
} else {
key = goog.object.findKey(featureNS, function(value) {
return value === child.namespaceURI;
});
var key = '';
var count = 0;
var uri = child.namespaceURI;
for (var candidate in featureNS) {
if (featureNS[candidate] === uri) {
key = candidate;
break;
}
++count;
}
if (!key) {
key = prefix + count;
featureNS[key] = uri;
}
featureType.push(key + ':' + ft);
}