From 0a0d12ec8a3dd4a887280a4d5f0d64daa572a983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Thu, 19 Jun 2014 10:02:12 +0200 Subject: [PATCH] Make ol.Overlay always call setOffset --- src/ol/overlay.js | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/src/ol/overlay.js b/src/ol/overlay.js index 3681ef476d..70cd73fb07 100644 --- a/src/ol/overlay.js +++ b/src/ol/overlay.js @@ -136,9 +136,9 @@ ol.Overlay = function(options) { if (goog.isDef(options.element)) { this.setElement(options.element); } - if (goog.isDef(options.offset)) { - this.setOffset(options.offset); - } + + this.setOffset(goog.isDef(options.offset) ? options.offset : [0, 0]); + if (goog.isDef(options.position)) { this.setPosition(options.position); } @@ -151,14 +151,6 @@ ol.Overlay = function(options) { goog.inherits(ol.Overlay, ol.Object); -/** - * Default offsets. - * @type {Array.} - * @private - */ -ol.Overlay.offset_ = [0, 0]; - - /** * Get the DOM element of this overlay. * @return {Element|undefined} The Element containing the overlay. @@ -193,12 +185,12 @@ goog.exportProperty( /** * Get the offset of this overlay. - * @return {Array.|undefined} The offset. + * @return {Array.} The offset. * @todo observable * @todo api */ ol.Overlay.prototype.getOffset = function() { - return /** @type {Array.|undefined} */ ( + return /** @type {Array.} */ ( this.get(ol.OverlayProperty.OFFSET)); }; goog.exportProperty( @@ -343,7 +335,7 @@ goog.exportProperty( /** * Set the offset for this overlay. - * @param {Array.|undefined} offset Offset. + * @param {Array.} offset Offset. * @todo observable * @todo api */ @@ -409,9 +401,7 @@ ol.Overlay.prototype.updatePixelPosition_ = function() { goog.asserts.assert(goog.isDef(mapSize)); var style = this.element_.style; var offset = this.getOffset(); - if (!goog.isDef(offset)) { - offset = ol.Overlay.offset_; - } + goog.asserts.assert(goog.isArray(offset)); var positioning = this.getPositioning(); if (positioning == ol.OverlayPositioning.BOTTOM_RIGHT || positioning == ol.OverlayPositioning.CENTER_RIGHT ||