From f1402522b54bd226f696f40300a25e0ea0d3b6ed Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Thu, 20 Nov 2014 11:40:09 +0100 Subject: [PATCH] More lenient Immediate geometry collection rendering Render geometry collection elements with a valid renderer inspite of throwing an assertion error. Allows support of hierarchies of points. --- src/ol/render/webgl/webglimmediate.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ol/render/webgl/webglimmediate.js b/src/ol/render/webgl/webglimmediate.js index 0a520dc0af..3b69dd78db 100644 --- a/src/ol/render/webgl/webglimmediate.js +++ b/src/ol/render/webgl/webglimmediate.js @@ -154,8 +154,12 @@ ol.render.webgl.Immediate.prototype.drawGeometryCollectionGeometry = for (i = 0, ii = geometries.length; i < ii; ++i) { var geometry = geometries[i]; var geometryRenderer = renderers[geometry.getType()]; - goog.asserts.assert(goog.isDef(geometryRenderer)); - geometryRenderer.call(this, geometry, data); + // Do not assert since all kinds of geometries are not handled yet. + // In order to support hierarchies, delegate instead what we can to + // valid renderers. + if (geometryRenderer) { + geometryRenderer.call(this, geometry, data); + } } };