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

Make ol.Overlay always call setPositioning

Browse Source
This commit is contained in:
Éric Lemoine
2014-06-19 10:09:57 +02:00
parent 0a0d12ec8a
commit af78adb417
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ol/overlay.js
View File

@@ -139,13 +139,13 @@ ol.Overlay = function(options) {
this.setOffset(goog.isDef(options.offset) ? options.offset : [0, 0]);
this.setPositioning(goog.isDef(options.positioning) ?
/** @type {ol.OverlayPositioning} */ (options.positioning) :
ol.OverlayPositioning.TOP_LEFT);
if (goog.isDef(options.position)) {
this.setPosition(options.position);
}
if (goog.isDef(options.positioning)) {
this.setPositioning(
/** @type {ol.OverlayPositioning} */ (options.positioning));
}
};
goog.inherits(ol.Overlay, ol.Object);
@@ -218,13 +218,13 @@ goog.exportProperty(
/**
* Get the current positioning of this overlay.
* @return {ol.OverlayPositioning|undefined} How the overlay is positioned
* @return {ol.OverlayPositioning} How the overlay is positioned
* relative to its point on the map.
* @todo observable
* @todo api
*/
ol.Overlay.prototype.getPositioning = function() {
return /** @type {ol.OverlayPositioning|undefined} */ (
return /** @type {ol.OverlayPositioning} */ (
this.get(ol.OverlayProperty.POSITIONING));
};
goog.exportProperty(
@@ -366,7 +366,7 @@ goog.exportProperty(
/**
* Set the positioning for this overlay.
* @param {ol.OverlayPositioning|undefined} positioning how the overlay is
* @param {ol.OverlayPositioning} positioning how the overlay is
* positioned relative to its point on the map.
* @todo observable
* @todo api
@@ -403,6 +403,8 @@ ol.Overlay.prototype.updatePixelPosition_ = function() {
var offset = this.getOffset();
goog.asserts.assert(goog.isArray(offset));
var positioning = this.getPositioning();
goog.asserts.assert(goog.isDef(positioning));
if (positioning == ol.OverlayPositioning.BOTTOM_RIGHT ||
positioning == ol.OverlayPositioning.CENTER_RIGHT ||
positioning == ol.OverlayPositioning.TOP_RIGHT) {