From 8d24311bc83adee9f0be098c9013135eb141f0b9 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Wed, 20 Feb 2013 09:37:11 +0100
Subject: [PATCH] Take the resolution constraint into account.

But only at the end of the pinch zoom action.
---
 src/ol/interaction/touchrotateandzoominteraction.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/ol/interaction/touchrotateandzoominteraction.js b/src/ol/interaction/touchrotateandzoominteraction.js
index 002d2ef40b..d06d6ee93d 100644
--- a/src/ol/interaction/touchrotateandzoominteraction.js
+++ b/src/ol/interaction/touchrotateandzoominteraction.js
@@ -102,7 +102,7 @@ ol.interaction.TouchRotateAndZoom.prototype.handleTouchMove =
   centroid.y -= viewportPosition.y;
   var anchor = map.getCoordinateFromPixel(centroid);
 
-  // scale
+  // scale, bypass the resolution constraint
   view.zoom_(map, view.getResolution() * scaleDelta, anchor);
 
   // rotate
@@ -118,7 +118,10 @@ ol.interaction.TouchRotateAndZoom.prototype.handleTouchMove =
 ol.interaction.TouchRotateAndZoom.prototype.handleTouchEnd =
     function(mapBrowserEvent) {
   if (this.targetTouches.length < 2) {
-    var view = mapBrowserEvent.map.getView();
+    var map = mapBrowserEvent.map;
+    var view = map.getView();
+    // take the resolution constraint into account
+    view.zoomToResolution(map, view.getResolution());
     view.setHint(ol.ViewHint.PANNING, -1);
     return false;
   } else {