Merge pull request #12282 from M393/dragzoom-view-padding
Fix DragZoom with view padding
This commit is contained in:
@@ -2,13 +2,6 @@
|
||||
* @module ol/interaction/DragZoom
|
||||
*/
|
||||
import DragBox from './DragBox.js';
|
||||
import {
|
||||
createOrUpdateFromCoordinates,
|
||||
getBottomLeft,
|
||||
getCenter,
|
||||
getTopRight,
|
||||
scaleFromCenter,
|
||||
} from '../extent.js';
|
||||
import {easeOut} from '../easing.js';
|
||||
import {shiftKeyOnly} from '../events/condition.js';
|
||||
|
||||
@@ -71,29 +64,17 @@ class DragZoom extends DragBox {
|
||||
onBoxEnd(event) {
|
||||
const map = this.getMap();
|
||||
const view = /** @type {!import("../View.js").default} */ (map.getView());
|
||||
const size = /** @type {!import("../size.js").Size} */ (map.getSize());
|
||||
let extent = this.getGeometry().getExtent();
|
||||
let geometry = this.getGeometry();
|
||||
|
||||
if (this.out_) {
|
||||
const mapExtent = view.calculateExtentInternal(size);
|
||||
const boxPixelExtent = createOrUpdateFromCoordinates([
|
||||
map.getPixelFromCoordinateInternal(getBottomLeft(extent)),
|
||||
map.getPixelFromCoordinateInternal(getTopRight(extent)),
|
||||
]);
|
||||
const factor = view.getResolutionForExtentInternal(boxPixelExtent, size);
|
||||
|
||||
scaleFromCenter(mapExtent, 1 / factor);
|
||||
extent = mapExtent;
|
||||
const rotatedExtent = view.rotatedExtentForGeometry(geometry);
|
||||
const resolution = view.getResolutionForExtentInternal(rotatedExtent);
|
||||
const factor = view.getResolution() / resolution;
|
||||
geometry = geometry.clone();
|
||||
geometry.scale(factor * factor);
|
||||
}
|
||||
|
||||
const resolution = view.getConstrainedResolution(
|
||||
view.getResolutionForExtentInternal(extent, size)
|
||||
);
|
||||
const center = view.getConstrainedCenter(getCenter(extent), resolution);
|
||||
|
||||
view.animateInternal({
|
||||
resolution: resolution,
|
||||
center: center,
|
||||
view.fitInternal(geometry, {
|
||||
duration: this.duration_,
|
||||
easing: easeOut,
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user