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

Stricter type checking for map projection

Browse Source
This commit is contained in:
Tom Payne
2012-07-19 09:56:04 +02:00
parent 43c32e6da7
commit 305462f57a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/map.js
+6 -2
View File
@@ -1,3 +1,5 @@
// FIXME recheck layer/map projection compatability when projection changes
goog.provide('ol.Map'); goog.provide('ol.Map');
goog.provide('ol.MapProperty'); 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() { ol.Map.prototype.getProjection = function() {
return /** @type {ol.Projection} */ (this.get(ol.MapProperty.PROJECTION)); return /** @type {ol.Projection} */ (this.get(ol.MapProperty.PROJECTION));
@@ -390,7 +392,9 @@ ol.Map.prototype.handleCenterChanged = function() {
ol.Map.prototype.handleLayerAdd = function(layer) { ol.Map.prototype.handleLayerAdd = function(layer) {
var projection = this.getProjection(); var projection = this.getProjection();
var storeProjection = layer.getStore().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); var layerRenderer = this.createLayerRenderer(layer);
this.setLayerRenderer(layer, layerRenderer); this.setLayerRenderer(layer, layerRenderer);
}; };