From b1b9edb43d68a94f652d8376264135e75e4f454a Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Mon, 18 Dec 2017 12:34:31 +0100 Subject: [PATCH] Rename _ol_OverlayPositioning_ to OverlayPositioning --- src/ol/Overlay.js | 28 ++++++++++++++-------------- src/ol/control/OverviewMap.js | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/ol/Overlay.js b/src/ol/Overlay.js index 46d7a12688..f5c128f794 100644 --- a/src/ol/Overlay.js +++ b/src/ol/Overlay.js @@ -4,7 +4,7 @@ import {inherits} from './index.js'; import MapEventType from './MapEventType.js'; import _ol_Object_ from './Object.js'; -import _ol_OverlayPositioning_ from './OverlayPositioning.js'; +import OverlayPositioning from './OverlayPositioning.js'; import _ol_css_ from './css.js'; import {removeNode, removeChildren, outerWidth, outerHeight} from './dom.js'; import _ol_events_ from './events.js'; @@ -139,7 +139,7 @@ var _ol_Overlay_ = function(options) { this.setPositioning(options.positioning !== undefined ? /** @type {ol.OverlayPositioning} */ (options.positioning) : - _ol_OverlayPositioning_.TOP_LEFT); + OverlayPositioning.TOP_LEFT); if (options.position !== undefined) { this.setPosition(options.position); @@ -481,9 +481,9 @@ _ol_Overlay_.prototype.updateRenderedPosition = function(pixel, mapSize) { var offsetX = offset[0]; var offsetY = offset[1]; - if (positioning == _ol_OverlayPositioning_.BOTTOM_RIGHT || - positioning == _ol_OverlayPositioning_.CENTER_RIGHT || - positioning == _ol_OverlayPositioning_.TOP_RIGHT) { + if (positioning == OverlayPositioning.BOTTOM_RIGHT || + positioning == OverlayPositioning.CENTER_RIGHT || + positioning == OverlayPositioning.TOP_RIGHT) { if (this.rendered.left_ !== '') { this.rendered.left_ = style.left = ''; } @@ -495,9 +495,9 @@ _ol_Overlay_.prototype.updateRenderedPosition = function(pixel, mapSize) { if (this.rendered.right_ !== '') { this.rendered.right_ = style.right = ''; } - if (positioning == _ol_OverlayPositioning_.BOTTOM_CENTER || - positioning == _ol_OverlayPositioning_.CENTER_CENTER || - positioning == _ol_OverlayPositioning_.TOP_CENTER) { + if (positioning == OverlayPositioning.BOTTOM_CENTER || + positioning == OverlayPositioning.CENTER_CENTER || + positioning == OverlayPositioning.TOP_CENTER) { offsetX -= this.element.offsetWidth / 2; } var left = Math.round(pixel[0] + offsetX) + 'px'; @@ -505,9 +505,9 @@ _ol_Overlay_.prototype.updateRenderedPosition = function(pixel, mapSize) { this.rendered.left_ = style.left = left; } } - if (positioning == _ol_OverlayPositioning_.BOTTOM_LEFT || - positioning == _ol_OverlayPositioning_.BOTTOM_CENTER || - positioning == _ol_OverlayPositioning_.BOTTOM_RIGHT) { + if (positioning == OverlayPositioning.BOTTOM_LEFT || + positioning == OverlayPositioning.BOTTOM_CENTER || + positioning == OverlayPositioning.BOTTOM_RIGHT) { if (this.rendered.top_ !== '') { this.rendered.top_ = style.top = ''; } @@ -519,9 +519,9 @@ _ol_Overlay_.prototype.updateRenderedPosition = function(pixel, mapSize) { if (this.rendered.bottom_ !== '') { this.rendered.bottom_ = style.bottom = ''; } - if (positioning == _ol_OverlayPositioning_.CENTER_LEFT || - positioning == _ol_OverlayPositioning_.CENTER_CENTER || - positioning == _ol_OverlayPositioning_.CENTER_RIGHT) { + if (positioning == OverlayPositioning.CENTER_LEFT || + positioning == OverlayPositioning.CENTER_CENTER || + positioning == OverlayPositioning.CENTER_RIGHT) { offsetY -= this.element.offsetHeight / 2; } var top = Math.round(pixel[1] + offsetY) + 'px'; diff --git a/src/ol/control/OverviewMap.js b/src/ol/control/OverviewMap.js index ae2849f239..0a23cbf08b 100644 --- a/src/ol/control/OverviewMap.js +++ b/src/ol/control/OverviewMap.js @@ -9,7 +9,7 @@ import _ol_MapProperty_ from '../MapProperty.js'; import _ol_Object_ from '../Object.js'; import ObjectEventType from '../ObjectEventType.js'; import _ol_Overlay_ from '../Overlay.js'; -import _ol_OverlayPositioning_ from '../OverlayPositioning.js'; +import OverlayPositioning from '../OverlayPositioning.js'; import _ol_ViewProperty_ from '../ViewProperty.js'; import Control from '../control/Control.js'; import _ol_coordinate_ from '../coordinate.js'; @@ -142,7 +142,7 @@ var OverviewMap = function(opt_options) { */ this.boxOverlay_ = new _ol_Overlay_({ position: [0, 0], - positioning: _ol_OverlayPositioning_.BOTTOM_LEFT, + positioning: OverlayPositioning.BOTTOM_LEFT, element: box }); this.ovmap_.addOverlay(this.boxOverlay_);