From 5d461fa0e78e4b11f4ed4362de952bcefc5f7dbd Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Fri, 18 Mar 2016 17:43:38 -0600 Subject: [PATCH 1/5] Remove extra map.render() calls from drag pan interaction --- src/ol/interaction/dragpan.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/ol/interaction/dragpan.js b/src/ol/interaction/dragpan.js index c6b7135e16..f3861b2659 100644 --- a/src/ol/interaction/dragpan.js +++ b/src/ol/interaction/dragpan.js @@ -85,7 +85,6 @@ ol.interaction.DragPan.handleDragEvent_ = function(mapBrowserEvent) { ol.coordinate.rotate(center, viewState.rotation); ol.coordinate.add(center, viewState.center); center = view.constrainCenter(center); - map.render(); view.setCenter(center); } this.lastCentroid = centroid; @@ -117,7 +116,6 @@ ol.interaction.DragPan.handleUpEvent_ = function(mapBrowserEvent) { view.setCenter(dest); } view.setHint(ol.View.Hint.INTERACTING, -1); - map.render(); return false; } else { this.lastCentroid = null; @@ -140,7 +138,6 @@ ol.interaction.DragPan.handleDownEvent_ = function(mapBrowserEvent) { if (!this.handlingDownUpSequence) { view.setHint(ol.View.Hint.INTERACTING, 1); } - map.render(); if (this.kineticPreRenderFn_ && map.removePreRenderFunction(this.kineticPreRenderFn_)) { view.setCenter(mapBrowserEvent.frameState.viewState.center); From 92e83aebe089e4a5086d9e188ab9b785006de1da Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Fri, 18 Mar 2016 17:46:01 -0600 Subject: [PATCH 2/5] Remove extra map.render() calls from drag rotate interaction --- src/ol/interaction/dragrotate.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/ol/interaction/dragrotate.js b/src/ol/interaction/dragrotate.js index 487492e6de..3aebd33c85 100644 --- a/src/ol/interaction/dragrotate.js +++ b/src/ol/interaction/dragrotate.js @@ -72,7 +72,6 @@ ol.interaction.DragRotate.handleDragEvent_ = function(mapBrowserEvent) { var delta = theta - this.lastAngle_; var view = map.getView(); var rotation = view.getRotation(); - map.render(); ol.interaction.Interaction.rotateWithoutConstraints( map, view, rotation - delta); } @@ -116,7 +115,6 @@ ol.interaction.DragRotate.handleDownEvent_ = function(mapBrowserEvent) { this.condition_(mapBrowserEvent)) { var map = mapBrowserEvent.map; map.getView().setHint(ol.View.Hint.INTERACTING, 1); - map.render(); this.lastAngle_ = undefined; return true; } else { From 1439f14cf3d1d08722a5e4c535c06210d9ddaae2 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Fri, 18 Mar 2016 18:05:17 -0600 Subject: [PATCH 3/5] Remove extra map.render() calls from drag rotate/zoom interaction --- src/ol/interaction/dragrotateandzoom.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ol/interaction/dragrotateandzoom.js b/src/ol/interaction/dragrotateandzoom.js index 07ed84e985..dd30ccc1c3 100644 --- a/src/ol/interaction/dragrotateandzoom.js +++ b/src/ol/interaction/dragrotateandzoom.js @@ -85,7 +85,6 @@ ol.interaction.DragRotateAndZoom.handleDragEvent_ = function(mapBrowserEvent) { var theta = Math.atan2(deltaY, deltaX); var magnitude = Math.sqrt(deltaX * deltaX + deltaY * deltaY); var view = map.getView(); - map.render(); if (this.lastAngle_ !== undefined) { var angleDelta = theta - this.lastAngle_; ol.interaction.Interaction.rotateWithoutConstraints( From 22add7e4317e7ea9c0a40d4804576201212184ee Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Fri, 18 Mar 2016 18:07:10 -0600 Subject: [PATCH 4/5] Remove extra map.render() calls from keyboard zoom interaction --- src/ol/interaction/keyboardzoom.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ol/interaction/keyboardzoom.js b/src/ol/interaction/keyboardzoom.js index 3489a9d81b..e169190c2e 100644 --- a/src/ol/interaction/keyboardzoom.js +++ b/src/ol/interaction/keyboardzoom.js @@ -73,7 +73,6 @@ ol.interaction.KeyboardZoom.handleEvent = function(mapBrowserEvent) { (charCode == '+'.charCodeAt(0) || charCode == '-'.charCodeAt(0))) { var map = mapBrowserEvent.map; var delta = (charCode == '+'.charCodeAt(0)) ? this.delta_ : -this.delta_; - map.render(); var view = map.getView(); ol.interaction.Interaction.zoomByDelta( map, view, delta, undefined, this.duration_); From 684a5512736f9bee20b5caa5768195ac65de435a Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Fri, 18 Mar 2016 18:08:35 -0600 Subject: [PATCH 5/5] Remove extra map.render() calls from mousewheel zoom interaction --- src/ol/interaction/mousewheelzoom.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ol/interaction/mousewheelzoom.js b/src/ol/interaction/mousewheelzoom.js index 0f010cf8a8..3457e7b528 100644 --- a/src/ol/interaction/mousewheelzoom.js +++ b/src/ol/interaction/mousewheelzoom.js @@ -132,7 +132,6 @@ ol.interaction.MouseWheelZoom.prototype.doZoom_ = function(map) { var view = map.getView(); - map.render(); ol.interaction.Interaction.zoomByDelta(map, view, -delta, this.lastAnchor_, this.duration_);