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

Merge pull request #636 from twpayne/cache-length

Browse Source 
Cache array length in ol.control.Attribution
This commit is contained in:
Tom Payne
2013-04-22 01:34:20 -07:00
parent fe1475105a 8264343e54
commit bc3dc0fd74
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ol/control/attributioncontrol.js
View File

@@ -74,7 +74,7 @@ ol.control.Attribution.prototype.getTileSourceAttributions =
function(usedTiles, sources) { function(usedTiles, sources) {
/** @type {Object.<string, ol.Attribution>} */ /** @type {Object.<string, ol.Attribution>} */
var attributions = {}; var attributions = {};
var i, tileRanges, tileSource, tileSourceAttribution, var i, ii, tileRanges, tileSource, tileSourceAttribution,
tileSourceAttributionKey, tileSourceAttributions, tileSourceKey, z; tileSourceAttributionKey, tileSourceAttributions, tileSourceKey, z;
for (tileSourceKey in usedTiles) { for (tileSourceKey in usedTiles) {
goog.asserts.assert(tileSourceKey in sources); goog.asserts.assert(tileSourceKey in sources);
@@ -84,7 +84,7 @@ ol.control.Attribution.prototype.getTileSourceAttributions =
continue; continue;
} }
tileRanges = usedTiles[tileSourceKey]; tileRanges = usedTiles[tileSourceKey];
for (i = 0; i < tileSourceAttributions.length; ++i) { for (i = 0, ii = tileSourceAttributions.length; i < ii; ++i) {
tileSourceAttribution = tileSourceAttributions[i]; tileSourceAttribution = tileSourceAttributions[i];
tileSourceAttributionKey = goog.getUid(tileSourceAttribution).toString(); tileSourceAttributionKey = goog.getUid(tileSourceAttribution).toString();
if (tileSourceAttributionKey in attributions) { if (tileSourceAttributionKey in attributions) {
@@ -134,8 +134,8 @@ ol.control.Attribution.prototype.updateElement_ = function(frameState) {
sources[goog.getUid(source).toString()] = source; sources[goog.getUid(source).toString()] = source;
var attributions = source.getAttributions(); var attributions = source.getAttributions();
if (!goog.isNull(attributions)) { if (!goog.isNull(attributions)) {
var attribution, i; var attribution, i, ii;
for (i = 0; i < attributions.length; ++i) { for (i = 0, ii = attributions.length; i < ii; ++i) {
attribution = attributions[i]; attribution = attributions[i];
attributionKey = goog.getUid(attribution).toString(); attributionKey = goog.getUid(attribution).toString();
attributionsToRemove[attributionKey] = true; attributionsToRemove[attributionKey] = true;
@@ -154,8 +154,8 @@ ol.control.Attribution.prototype.updateElement_ = function(frameState) {
var attributionKeys = var attributionKeys =
goog.array.map(goog.object.getKeys(attributions), Number); goog.array.map(goog.object.getKeys(attributions), Number);
goog.array.sort(attributionKeys); goog.array.sort(attributionKeys);
var i, attributionElement, attributionKey; var i, ii, attributionElement, attributionKey;
for (i = 0; i < attributionKeys.length; ++i) { for (i = 0, ii = attributionKeys.length; i < ii; ++i) {
attributionKey = attributionKeys[i].toString(); attributionKey = attributionKeys[i].toString();
if (attributionKey in this.attributionElements_) { if (attributionKey in this.attributionElements_) {
if (!this.attributionElementRenderedVisible_[attributionKey]) { if (!this.attributionElementRenderedVisible_[attributionKey]) {