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

Use assertInstanceof instead of typecast

Browse Source
This commit is contained in:
Tom Payne
2013-12-13 17:22:21 +01:00
parent b12bed8949
commit fd733eca82
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/renderer/canvas/canvasmaprenderer.js
+3 -2
View File
@@ -13,6 +13,7 @@ goog.require('ol.layer.Tile');
goog.require('ol.layer.Vector'); goog.require('ol.layer.Vector');
goog.require('ol.renderer.Map'); goog.require('ol.renderer.Map');
goog.require('ol.renderer.canvas.ImageLayer'); goog.require('ol.renderer.canvas.ImageLayer');
goog.require('ol.renderer.canvas.Layer');
goog.require('ol.renderer.canvas.TileLayer'); goog.require('ol.renderer.canvas.TileLayer');
goog.require('ol.renderer.canvas.VectorLayer'); goog.require('ol.renderer.canvas.VectorLayer');
goog.require('ol.source.State'); goog.require('ol.source.State');
@@ -114,8 +115,8 @@ ol.renderer.canvas.Map.prototype.renderFrame = function(frameState) {
for (i = 0, ii = layersArray.length; i < ii; ++i) { for (i = 0, ii = layersArray.length; i < ii; ++i) {
layer = layersArray[i]; layer = layersArray[i];
layerRenderer = layerRenderer = this.getLayerRenderer(layer);
/** @type {ol.renderer.canvas.Layer} */ (this.getLayerRenderer(layer)); goog.asserts.assertInstanceof(layerRenderer, ol.renderer.canvas.Layer);
layerState = layerStates[goog.getUid(layer)]; layerState = layerStates[goog.getUid(layer)];
if (!layerState.visible || if (!layerState.visible ||
layerState.sourceState != ol.source.State.READY || layerState.sourceState != ol.source.State.READY ||
src/ol/renderer/dom/dommaprenderer.js
+3 -2
View File
@@ -9,6 +9,7 @@ goog.require('ol.layer.Image');
goog.require('ol.layer.Tile'); goog.require('ol.layer.Tile');
goog.require('ol.renderer.Map'); goog.require('ol.renderer.Map');
goog.require('ol.renderer.dom.ImageLayer'); goog.require('ol.renderer.dom.ImageLayer');
goog.require('ol.renderer.dom.Layer');
goog.require('ol.renderer.dom.TileLayer'); goog.require('ol.renderer.dom.TileLayer');
goog.require('ol.source.State'); goog.require('ol.source.State');
@@ -93,8 +94,8 @@ ol.renderer.dom.Map.prototype.renderFrame = function(frameState) {
var layerKey; var layerKey;
for (layerKey in this.getLayerRenderers()) { for (layerKey in this.getLayerRenderers()) {
if (!(layerKey in layerStates)) { if (!(layerKey in layerStates)) {
layerRenderer = /** @type {ol.renderer.dom.Layer} */ layerRenderer = this.getLayerRendererByKey(layerKey);
(this.getLayerRendererByKey(layerKey)); goog.asserts.assertInstanceof(layerRenderer, ol.renderer.dom.Layer);
goog.dom.removeNode(layerRenderer.getTarget()); goog.dom.removeNode(layerRenderer.getTarget());
} }
} }