Make ol.Map#setView do not accept undefined

With this change map.setView(null) is permitted, but map.setView(undefined) is not. map.getView now always returns a defined value, which may be null is setView was called with null.
This commit is contained in:
Éric Lemoine
2014-09-17 11:25:14 +02:00
parent 163cc5b873
commit cb8b896230
8 changed files with 11 additions and 11 deletions
@@ -50,7 +50,7 @@ ol.interaction.DoubleClickZoom.prototype.handleMapBrowserEvent =
var anchor = mapBrowserEvent.coordinate;
var delta = browserEvent.shiftKey ? -this.delta_ : this.delta_;
var view = map.getView();
goog.asserts.assert(goog.isDef(view));
goog.asserts.assert(!goog.isNull(view));
ol.interaction.Interaction.zoomByDelta(
map, view, delta, anchor, this.duration_);
mapBrowserEvent.preventDefault();
+1 -1
View File
@@ -100,7 +100,7 @@ ol.interaction.DragAndDrop.prototype.handleResult_ = function(file, result) {
var projection = this.reprojectTo_;
if (goog.isNull(projection)) {
var view = map.getView();
goog.asserts.assert(goog.isDef(view));
goog.asserts.assert(!goog.isNull(view));
projection = view.getProjection();
goog.asserts.assert(goog.isDef(projection));
}
+1 -1
View File
@@ -54,7 +54,7 @@ goog.inherits(ol.interaction.DragZoom, ol.interaction.DragBox);
ol.interaction.DragZoom.prototype.onBoxEnd = function() {
var map = this.getMap();
var view = map.getView();
goog.asserts.assert(goog.isDef(view));
goog.asserts.assert(!goog.isNull(view));
var extent = this.getGeometry().getExtent();
var center = ol.extent.getCenter(extent);
var size = map.getSize();
+1 -1
View File
@@ -70,7 +70,7 @@ ol.interaction.KeyboardPan.prototype.handleMapBrowserEvent =
keyCode == goog.events.KeyCodes.UP)) {
var map = mapBrowserEvent.map;
var view = map.getView();
goog.asserts.assert(goog.isDef(view));
goog.asserts.assert(!goog.isNull(view));
var viewState = view.getState();
var mapUnitsDelta = viewState.resolution * this.pixelDelta_;
var deltaX = 0, deltaY = 0;
@@ -70,7 +70,7 @@ ol.interaction.KeyboardZoom.prototype.handleMapBrowserEvent =
var delta = (charCode == '+'.charCodeAt(0)) ? this.delta_ : -this.delta_;
map.render();
var view = map.getView();
goog.asserts.assert(goog.isDef(view));
goog.asserts.assert(!goog.isNull(view));
ol.interaction.Interaction.zoomByDelta(
map, view, delta, undefined, this.duration_);
mapBrowserEvent.preventDefault();
@@ -101,7 +101,7 @@ ol.interaction.MouseWheelZoom.prototype.doZoom_ = function(map) {
var delta = goog.math.clamp(this.delta_, -maxDelta, maxDelta);
var view = map.getView();
goog.asserts.assert(goog.isDef(view));
goog.asserts.assert(!goog.isNull(view));
map.render();
ol.interaction.Interaction.zoomByDelta(map, view, -delta, this.lastAnchor_,