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

Remove unnecessary typecasts

Browse Source 
goog.asserts.assertInstanceof is sufficient for the compiler to deduce
the type.
This commit is contained in:
Tom Payne
2014-01-13 18:10:31 +01:00
parent 610eefb932
commit 3835c299b5
1 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/ol/render/vector.js
View File

@@ -43,9 +43,7 @@ ol.renderer.vector.renderFeature = function(
ol.renderer.vector.renderGeometryCollectionGeometry_ =
function(replayGroup, geometry, style, data) {
goog.asserts.assertInstanceof(geometry, ol.geom.GeometryCollection);
var geometryCollectionGeometry = /** @type {ol.geom.GeometryCollection} */ (
geometry);
var geometries = geometryCollectionGeometry.getGeometriesArray();
var geometries = geometry.getGeometriesArray();
var i, ii;
for (i = 0, ii = geometries.length; i < ii; ++i) {
var geometryRenderer =
@@ -70,11 +68,10 @@ ol.renderer.vector.renderLineStringGeometry_ =
return;
}
goog.asserts.assertInstanceof(geometry, ol.geom.LineString);
var lineStringGeometry = /** @type {ol.geom.LineString} */ (geometry);
var replay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.LINE_STRING);
replay.setFillStrokeStyle(null, strokeStyle);
replay.drawLineStringGeometry(lineStringGeometry, data);
replay.drawLineStringGeometry(geometry, data);
};
@@ -92,12 +89,10 @@ ol.renderer.vector.renderMultiLineStringGeometry_ =
return;
}
goog.asserts.assertInstanceof(geometry, ol.geom.MultiLineString);
var multiLineStringGeometry = /** @type {ol.geom.MultiLineString} */
(geometry);
var replay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.LINE_STRING);
replay.setFillStrokeStyle(null, strokeStyle);
replay.drawMultiLineStringGeometry(multiLineStringGeometry, data);
replay.drawMultiLineStringGeometry(geometry, data);
};
@@ -116,12 +111,10 @@ ol.renderer.vector.renderMultiPolygonGeometry_ =
return;
}
goog.asserts.assertInstanceof(geometry, ol.geom.MultiPolygon);
var multiPolygonGeometry = /** @type {ol.geom.MultiPolygon} */
(geometry);
var replay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.POLYGON);
replay.setFillStrokeStyle(fillStyle, strokeStyle);
replay.drawMultiPolygonGeometry(multiPolygonGeometry, data);
replay.drawMultiPolygonGeometry(geometry, data);
};
@@ -139,11 +132,10 @@ ol.renderer.vector.renderPointGeometry_ =
return;
}
goog.asserts.assertInstanceof(geometry, ol.geom.Point);
var pointGeometry = /** @type {ol.geom.Point} */ (geometry);
var replay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.IMAGE);
replay.setImageStyle(imageStyle);
replay.drawPointGeometry(pointGeometry, data);
replay.drawPointGeometry(geometry, data);
};
@@ -161,11 +153,10 @@ ol.renderer.vector.renderMultiPointGeometry_ =
return;
}
goog.asserts.assertInstanceof(geometry, ol.geom.MultiPoint);
var multiPointGeometry = /** @type {ol.geom.MultiPoint} */ (geometry);
var replay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.IMAGE);
replay.setImageStyle(imageStyle);
replay.drawMultiPointGeometry(multiPointGeometry, data);
replay.drawMultiPointGeometry(geometry, data);
};
@@ -184,11 +175,10 @@ ol.renderer.vector.renderPolygonGeometry_ =
return;
}
goog.asserts.assertInstanceof(geometry, ol.geom.Polygon);
var polygonGeometry = /** @type {ol.geom.Polygon} */ (geometry);
var replay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.POLYGON);
replay.setFillStrokeStyle(fillStyle, strokeStyle);
replay.drawPolygonGeometry(polygonGeometry, data);
replay.drawPolygonGeometry(geometry, data);
};