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

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

Browse Source
This commit is contained in:
Tim Schaub
2016-02-03 10:19:47 -07:00
parent 554887ae14
commit 1a9367228d
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/ol/format/gml/gmlbaseformat.js
View File

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