Refactor and optimize attributions

src/ol/base/coveragearea.js

@@ -18,15 +18,21 @@ ol.CoverageArea = function(extent) {
 };
 
 
+/**
+ * @param {ol.Extent} extent Extent.
+ * @return {boolean} Intersects.
+ */
+ol.CoverageArea.prototype.intersectsExtent = function(extent) {
+  return this.extent.intersects(extent);
+};
+
+
 /**
  * @param {ol.Extent} extent Extent.
  * @param {number} resolution Resolution.
  * @return {boolean} Intersects.
  */
-ol.CoverageArea.prototype.intersectsExtentAndResolution =
+ol.CoverageArea.prototype.intersectsExtentAndResolution = goog.abstractMethod;
-    function(extent, resolution) {
-  return this.extent.intersects(extent);
-};
 
 
 /**

src/ol/tile/tilecoveragearea.js

@@ -25,14 +25,16 @@ ol.TileCoverageArea = function(tileGrid, extent, minZ, maxZ) {
   this.tileGrid_ = tileGrid;
 
   /**
+   * @private
    * @type {number}
    */
-  this.minZ = minZ;
+  this.minZ_ = minZ;
 
   /**
+   * @private
    * @type {number}
    */
-  this.maxZ = maxZ;
+  this.maxZ_ = maxZ;
 
 };
 goog.inherits(ol.TileCoverageArea, ol.CoverageArea);
@@ -44,8 +46,17 @@ goog.inherits(ol.TileCoverageArea, ol.CoverageArea);
 ol.TileCoverageArea.prototype.intersectsExtentAndResolution =
     function(extent, resolution) {
   var z = this.tileGrid_.getZForResolution(resolution);
-  return this.minZ <= z && z <= this.maxZ &&
+  return this.intersectsExtentAndZ(extent, z);
-      goog.base(this, 'intersectsExtentAndResolution', extent, resolution);
+};
+
+
+/**
+ * @param {ol.Extent} extent Extent.
+ * @param {number} z Z.
+ * @return {boolean} Intersects.
+ */
+ol.TileCoverageArea.prototype.intersectsExtentAndZ = function(extent, z) {
+  return this.minZ_ <= z && z <= this.maxZ_ && this.intersectsExtent(extent);
 };
 
 
@@ -55,5 +66,6 @@ ol.TileCoverageArea.prototype.intersectsExtentAndResolution =
  */
 ol.TileCoverageArea.prototype.transform = function(transformFn) {
   var extent = this.extent.transform(transformFn);
-  return new ol.TileCoverageArea(this.tileGrid_, extent, this.minZ, this.maxZ);
+  return new ol.TileCoverageArea(
+      this.tileGrid_, extent, this.minZ_, this.maxZ_);
 };

src/ol/view/attribution.js

@@ -8,6 +8,7 @@ goog.require('goog.dom');
 goog.require('goog.dom.TagName');
 goog.require('goog.events');
 goog.require('goog.events.EventType');
+goog.require('goog.object');
 goog.require('goog.style');
 goog.require('ol.Collection');
 goog.require('ol.CoverageArea');
@@ -82,38 +83,47 @@ goog.inherits(ol.view.Attribution, ol.View);
 ol.view.Attribution.prototype.createAttributionElementsForLayer_ =
     function(layer) {
 
+  var store = layer.getStore();
+  var attributions = store.getAttributions();
+  if (goog.isNull(attributions)) {
+    return;
+  }
+
   var map = this.getMap();
   var mapIsDef = map.isDef();
   var mapExtent = /** @type {ol.Extent} */ map.getExtent();
   var mapProjection = /** @type {ol.Projection} */ map.getProjection();
-  var mapResolution = map.getResolution();
+  var mapResolution = /** @type {number} */ map.getResolution();
 
   var layerVisible = layer.getVisible();
 
-  var store = layer.getStore();
+  var attributionVisibilities;
-  var attributions = store.getAttributions();
+  if (mapIsDef && layerVisible) {
-  if (!goog.isNull(attributions)) {
+    attributionVisibilities = this.getLayerAttributionVisiblities_(
-
+        layer, mapExtent, mapResolution, mapProjection);
-    goog.array.forEach(attributions, function(attribution) {
+  } else {
-
+    attributionVisibilities = null;
-      var attributionKey = goog.getUid(attribution);
-
-      var attributionElement = goog.dom.createElement(goog.dom.TagName.LI);
-      attributionElement.innerHTML = attribution.getHtml();
-
-      var attributionVisible = mapIsDef && layerVisible &&
-          this.getAttributionVisiblity_(
-              attribution, mapExtent, mapResolution, mapProjection);
-      goog.style.showElement(attributionElement, attributionVisible);
-
-      this.ulElement_.appendChild(attributionElement);
-
-      this.attributionElements_[attributionKey] = attributionElement;
-
-    }, this);
-
   }
 
+  goog.array.forEach(attributions, function(attribution) {
+
+    var attributionKey = goog.getUid(attribution);
+
+    var attributionElement = goog.dom.createElement(goog.dom.TagName.LI);
+    attributionElement.innerHTML = attribution.getHtml();
+
+    if (!map.isDef ||
+        !layerVisible ||
+        !attributionVisibilities[attributionKey]) {
+      goog.style.showElement(attributionElement, false);
+    }
+
+    this.ulElement_.appendChild(attributionElement);
+
+    this.attributionElements_[attributionKey] = attributionElement;
+
+  }, this);
+
 };
 
 
@@ -241,7 +251,7 @@ ol.view.Attribution.prototype.handleMapChanged = function() {
   var mapIsDef = map.isDef();
   var mapExtent = /** @type {ol.Extent} */ map.getExtent();
   var mapProjection = /** @type {ol.Projection} */ map.getProjection();
-  var mapResolution = /** @type {number} */ map.getResolution();
+  var mapResolution = map.getResolution();
 
   var layers = map.getLayers();
   layers.forEach(function(layer) {
@@ -277,49 +287,83 @@ ol.view.Attribution.prototype.handleMapLayersChanged = function() {
 
 
 /**
- * @param {ol.Attribution} attribution Attribution.
+ * @param {ol.Layer} layer Layer.
  * @param {ol.Extent} mapExtent Map extent.
  * @param {number} mapResolution Map resolution.
  * @param {ol.Projection} mapProjection Map projection.
- * @return {boolean} Attribution visibility.
+ * @return {Object.<number, boolean>} Attribution visibilities.
  * @private
  */
-ol.view.Attribution.prototype.getAttributionVisiblity_ =
+ol.view.Attribution.prototype.getLayerAttributionVisiblities_ =
-    function(attribution, mapExtent, mapResolution, mapProjection) {
+    function(layer, mapExtent, mapResolution, mapProjection) {
 
-  var attributionKey = goog.getUid(attribution);
+  var store = layer.getStore();
+  var attributions = store.getAttributions();
 
-  var attributionVisible = true;
+  if (goog.isNull(attributions)) {
+    return null;
+  }
 
-  var coverageAreas;
+  var mapZ;
-  if (attributionKey in this.coverageAreass_) {
+  if (store instanceof ol.TileStore) {
-    coverageAreas = this.coverageAreass_[attributionKey];
+    var tileStore = /** @type {ol.TileStore} */ store;
-  } else {
+    var tileGrid = tileStore.getTileGrid();
-    var attributionProjection = attribution.getProjection();
+    mapZ = tileGrid.getZForResolution(mapResolution);
-    coverageAreas = attribution.getCoverageAreas();
+  }
-    if (!goog.isNull(coverageAreas) &&
+
-        !ol.Projection.equivalent(attributionProjection, mapProjection)) {
+  var attributionVisibilities = {};
-      var transformFn = ol.Projection.getTransform(
+  goog.array.forEach(attributions, function(attribution) {
-          attributionProjection, mapProjection);
+
-      if (transformFn !== ol.Projection.cloneTransform) {
+    var attributionKey = goog.getUid(attribution);
-        coverageAreas = goog.array.map(coverageAreas, function(coverageArea) {
+
-          return coverageArea.transform(transformFn);
+    var attributionVisible = true;
-        });
+
+    var coverageAreas;
+    if (attributionKey in this.coverageAreass_) {
+      coverageAreas = this.coverageAreass_[attributionKey];
+    } else {
+      var attributionProjection = attribution.getProjection();
+      coverageAreas = attribution.getCoverageAreas();
+      if (!goog.isNull(coverageAreas) &&
+          !ol.Projection.equivalent(attributionProjection, mapProjection)) {
+        var transformFn = ol.Projection.getTransform(
+            attributionProjection, mapProjection);
+        if (transformFn !== ol.Projection.cloneTransform) {
+          coverageAreas = goog.array.map(coverageAreas, function(coverageArea) {
+            return coverageArea.transform(transformFn);
+          });
+        }
+      }
+      this.coverageAreass_[attributionKey] = coverageAreas;
+    }
+
+    if (!goog.isNull(coverageAreas)) {
+      if (store instanceof ol.TileStore) {
+        attributionVisible = goog.array.some(
+            coverageAreas,
+            /**
+             * @param {ol.TileCoverageArea} tileCoverageArea Tile coverage area.
+             */
+            function(tileCoverageArea) {
+              goog.asserts.assert(
+                  tileCoverageArea instanceof ol.TileCoverageArea);
+              return tileCoverageArea.intersectsExtentAndZ(mapExtent, mapZ);
+            });
+      } else {
+        attributionVisible = goog.array.some(
+            coverageAreas,
+            function(coverageArea) {
+              return coverageArea.intersectsExtentAndResolution(
+                  mapExtent, mapResolution);
+            });
       }
     }
-    this.coverageAreass_[attributionKey] = coverageAreas;
-  }
 
-  if (!goog.isNull(coverageAreas)) {
+    attributionVisibilities[attributionKey] = attributionVisible;
-    attributionVisible = goog.array.some(
-        coverageAreas,
-        function(coverageArea) {
-          return coverageArea.intersectsExtentAndResolution(
-              mapExtent, mapResolution);
-        });
-  }
 
-  return attributionVisible;
+  }, this);
+
+  return attributionVisibilities;
 
 };
 
@@ -334,13 +378,25 @@ ol.view.Attribution.prototype.getAttributionVisiblity_ =
  */
 ol.view.Attribution.prototype.updateLayerAttributionsVisibility_ =
     function(layer, mapIsDef, mapExtent, mapResolution, mapProjection) {
-  var layerVisible = layer.getVisible();
+  if (mapIsDef && layer.getVisible()) {
-  goog.array.forEach(layer.getStore().getAttributions(), function(attribution) {
+    var attributionVisibilities = this.getLayerAttributionVisiblities_(
-    var attributionKey = goog.getUid(attribution);
+        layer, mapExtent, mapResolution, mapProjection);
-    var attributionVisible = mapIsDef && layerVisible &&
+    goog.object.forEach(
-        this.getAttributionVisiblity_(
+        attributionVisibilities,
-            attribution, mapExtent, mapResolution, mapProjection);
+        function(attributionVisible, attributionKey) {
-    var attributionElement = this.attributionElements_[attributionKey];
+          var attributionElement = this.attributionElements_[attributionKey];
-    goog.style.showElement(attributionElement, attributionVisible);
+          goog.style.showElement(attributionElement, attributionVisible);
-  }, this);
+        },
+        this);
+  } else {
+    var store = layer.getStore();
+    var attributions = store.getAttributions();
+    if (!goog.isNull(attributions)) {
+      goog.array.forEach(attributions, function(attribution) {
+        var attributionKey = goog.getUid(attribution);
+        var attributionElement = this.attributionElements_[attributionKey];
+        goog.style.showElement(attributionElement, false);
+      }, this);
+    }
+  }
 };