From 8eb3e55aa060eca170369cd075e15012b3d31bba Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Wed, 9 Mar 2016 11:55:05 +0100 Subject: [PATCH 1/2] Remove use of goog.math.Size --- src/ol/control/overviewmapcontrol.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ol/control/overviewmapcontrol.js b/src/ol/control/overviewmapcontrol.js index 0abd7dd7ab..19f402ac52 100644 --- a/src/ol/control/overviewmapcontrol.js +++ b/src/ol/control/overviewmapcontrol.js @@ -282,17 +282,17 @@ ol.control.OverviewMap.prototype.validateExtent_ = function() { ovmap.getPixelFromCoordinate(ol.extent.getTopLeft(extent)); var bottomRightPixel = ovmap.getPixelFromCoordinate(ol.extent.getBottomRight(extent)); - var boxSize = new goog.math.Size( - Math.abs(topLeftPixel[0] - bottomRightPixel[0]), - Math.abs(topLeftPixel[1] - bottomRightPixel[1])); + + var boxWidth = Math.abs(topLeftPixel[0] - bottomRightPixel[0]); + var boxHeight = Math.abs(topLeftPixel[1] - bottomRightPixel[1]); var ovmapWidth = ovmapSize[0]; var ovmapHeight = ovmapSize[1]; - if (boxSize.width < ovmapWidth * ol.OVERVIEWMAP_MIN_RATIO || - boxSize.height < ovmapHeight * ol.OVERVIEWMAP_MIN_RATIO || - boxSize.width > ovmapWidth * ol.OVERVIEWMAP_MAX_RATIO || - boxSize.height > ovmapHeight * ol.OVERVIEWMAP_MAX_RATIO) { + if (boxWidth < ovmapWidth * ol.OVERVIEWMAP_MIN_RATIO || + boxHeight < ovmapHeight * ol.OVERVIEWMAP_MIN_RATIO || + boxWidth > ovmapWidth * ol.OVERVIEWMAP_MAX_RATIO || + boxHeight > ovmapHeight * ol.OVERVIEWMAP_MAX_RATIO) { this.resetExtent_(); } else if (!ol.extent.containsExtent(ovextent, extent)) { this.recenter_(); From 93abfc9a032a5473063227320682caf7a35a5a0d Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Wed, 9 Mar 2016 12:05:09 +0100 Subject: [PATCH 2/2] Remove use of goog.style.setBorderBoxSize --- src/ol/control/overviewmapcontrol.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/ol/control/overviewmapcontrol.js b/src/ol/control/overviewmapcontrol.js index 19f402ac52..3e97a64c62 100644 --- a/src/ol/control/overviewmapcontrol.js +++ b/src/ol/control/overviewmapcontrol.js @@ -5,8 +5,6 @@ goog.require('goog.dom'); goog.require('goog.dom.classlist'); goog.require('ol.events'); goog.require('ol.events.EventType'); -goog.require('goog.math.Size'); -goog.require('goog.style'); goog.require('ol'); goog.require('ol.Collection'); goog.require('ol.Map'); @@ -111,7 +109,9 @@ ol.control.OverviewMap = function(opt_options) { }, this); } - var box = goog.dom.createDom('DIV', 'ol-overviewmap-box'); + var box = document.createElement('DIV'); + box.className = 'ol-overviewmap-box'; + box.style.boxSizing = 'border-box'; /** * @type {ol.Overlay} @@ -396,10 +396,8 @@ ol.control.OverviewMap.prototype.updateBox_ = function() { // set box size calculated from map extent size and overview map resolution if (box) { - var boxWidth = Math.abs((bottomLeft[0] - topRight[0]) / ovresolution); - var boxHeight = Math.abs((topRight[1] - bottomLeft[1]) / ovresolution); - goog.style.setBorderBoxSize(box, new goog.math.Size( - boxWidth, boxHeight)); + box.style.width = Math.abs((bottomLeft[0] - topRight[0]) / ovresolution) + 'px'; + box.style.height = Math.abs((topRight[1] - bottomLeft[1]) / ovresolution) + 'px'; } };