From e37564e58cd8fc4654f5055745eae9560304c7e2 Mon Sep 17 00:00:00 2001
From: Ian Gilman <ian@iangilman.com>
Date: Tue, 13 Jan 2015 15:49:53 -0800
Subject: [PATCH] Better constraints for zooming out from corners
---
test/demo/m2/js/main.js | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/test/demo/m2/js/main.js b/test/demo/m2/js/main.js
index 9c9f4b32..5d0a0388 100644
--- a/test/demo/m2/js/main.js
+++ b/test/demo/m2/js/main.js
@@ -53,13 +53,14 @@
}
if (self.panBounds) {
- var viewBounds = self.viewer.viewport.getBounds();
var center = self.viewer.viewport.getCenter();
+ var currentCenter = self.viewer.viewport.getCenter(true);
+ var viewBounds = self.viewer.viewport.getBounds();
var bounds = self.panBounds.clone();
- var left = bounds.x + (viewBounds.width / 2);
- var top = bounds.y + (viewBounds.height / 2);
- var right = (bounds.x + bounds.width) - (viewBounds.width / 2);
- var bottom = (bounds.y + bounds.height) - (viewBounds.height / 2);
+ var left = Math.min(currentCenter.x, bounds.x + (viewBounds.width / 2));
+ var top = Math.min(currentCenter.y, bounds.y + (viewBounds.height / 2));
+ var right = Math.max(currentCenter.x, (bounds.x + bounds.width) - (viewBounds.width / 2));
+ var bottom = Math.max(currentCenter.y, (bounds.y + bounds.height) - (viewBounds.height / 2));
var x;
if (left <= right) {