From 305462f57a6b85a4d3e7310f9533afd0c1557130 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Thu, 19 Jul 2012 09:56:04 +0200 Subject: [PATCH] Stricter type checking for map projection --- src/ol/map.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ol/map.js b/src/ol/map.js index 0a1fd4ced6..61d0f152d1 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -1,3 +1,5 @@ +// FIXME recheck layer/map projection compatability when projection changes + goog.provide('ol.Map'); goog.provide('ol.MapProperty'); @@ -311,7 +313,7 @@ ol.Map.prototype.getPixelFromCoordinate = function(coordinate) { /** - * @return {ol.Projection} Projection. + * @return {ol.Projection|undefined} Projection. */ ol.Map.prototype.getProjection = function() { return /** @type {ol.Projection} */ (this.get(ol.MapProperty.PROJECTION)); @@ -390,7 +392,9 @@ ol.Map.prototype.handleCenterChanged = function() { ol.Map.prototype.handleLayerAdd = function(layer) { var projection = this.getProjection(); var storeProjection = layer.getStore().getProjection(); - goog.asserts.assert(ol.Projection.equivalent(projection, storeProjection)); + if (goog.isDef(projection)) { + goog.asserts.assert(ol.Projection.equivalent(projection, storeProjection)); + } var layerRenderer = this.createLayerRenderer(layer); this.setLayerRenderer(layer, layerRenderer); };