Rename ol.Map#requestRenderFrame to ol.Map#render

This commit is contained in:
Tom Payne
2014-02-20 16:31:43 +01:00
parent ebdb5dce22
commit a8f932fa07
18 changed files with 45 additions and 45 deletions

View File

@@ -71,7 +71,7 @@ ol.interaction.DragPan.prototype.handleDrag = function(mapBrowserEvent) {
ol.coordinate.rotate(newCenter, view2DState.rotation);
ol.coordinate.add(newCenter, this.startCenter);
newCenter = view.constrainCenter(newCenter);
map.requestRenderFrame();
map.render();
view.setCenter(newCenter);
};
@@ -104,7 +104,7 @@ ol.interaction.DragPan.prototype.handleDragEnd = function(mapBrowserEvent) {
dest = view2D.constrainCenter(dest);
view2D.setCenter(dest);
}
map.requestRenderFrame();
map.render();
};
@@ -120,7 +120,7 @@ ol.interaction.DragPan.prototype.handleDragStart = function(mapBrowserEvent) {
}
var map = mapBrowserEvent.map;
map.getView().setHint(ol.ViewHint.INTERACTING, 1);
map.requestRenderFrame();
map.render();
return true;
} else {
return false;
@@ -139,7 +139,7 @@ ol.interaction.DragPan.prototype.handleDown = function(mapBrowserEvent) {
goog.asserts.assert(!goog.isNull(mapBrowserEvent.frameState));
if (!goog.isNull(this.kineticPreRenderFn_) &&
map.removePreRenderFunction(this.kineticPreRenderFn_)) {
map.requestRenderFrame();
map.render();
view.setCenter(mapBrowserEvent.frameState.view2DState.center);
this.kineticPreRenderFn_ = null;
}

View File

@@ -80,7 +80,7 @@ ol.interaction.DragRotateAndZoom.prototype.handleDrag =
// FIXME works for View2D only
var view = map.getView().getView2D();
var view2DState = view.getView2DState();
map.requestRenderFrame();
map.render();
if (goog.isDef(this.lastAngle_)) {
var angleDelta = theta - this.lastAngle_;
ol.interaction.Interaction.rotateWithoutConstraints(

View File

@@ -60,7 +60,7 @@ ol.interaction.DragRotate.prototype.handleDrag = function(mapBrowserEvent) {
// FIXME works for View2D only
var view = map.getView().getView2D();
var view2DState = view.getView2DState();
map.requestRenderFrame();
map.render();
ol.interaction.Interaction.rotateWithoutConstraints(
map, view, view2DState.rotation - delta);
}
@@ -92,7 +92,7 @@ ol.interaction.DragRotate.prototype.handleDragStart =
if (browserEvent.isMouseActionButton() && this.condition_(mapBrowserEvent)) {
var map = mapBrowserEvent.map;
map.getView().setHint(ol.ViewHint.INTERACTING, 1);
map.requestRenderFrame();
map.render();
this.lastAngle_ = undefined;
return true;
} else {

View File

@@ -68,7 +68,7 @@ ol.interaction.KeyboardZoom.prototype.handleMapBrowserEvent =
(charCode == '+'.charCodeAt(0) || charCode == '-'.charCodeAt(0))) {
var map = mapBrowserEvent.map;
var delta = (charCode == '+'.charCodeAt(0)) ? this.delta_ : -this.delta_;
map.requestRenderFrame();
map.render();
// FIXME works for View2D only
var view = map.getView().getView2D();
ol.interaction.Interaction.zoomByDelta(

View File

@@ -114,7 +114,7 @@ ol.interaction.MouseWheelZoom.prototype.doZoom_ = function(map) {
// FIXME works for View2D only
var view = map.getView().getView2D();
map.requestRenderFrame();
map.render();
ol.interaction.Interaction.zoomByDelta(map, view, -delta, this.lastAnchor_,
this.duration_);

View File

@@ -73,7 +73,7 @@ ol.interaction.TouchPan.prototype.handleTouchMove = function(mapBrowserEvent) {
ol.coordinate.rotate(center, view2DState.rotation);
ol.coordinate.add(center, view2DState.center);
center = view2D.constrainCenter(center);
map.requestRenderFrame();
map.render();
view2D.setCenter(center);
}
this.lastCentroid = centroid;
@@ -104,7 +104,7 @@ ol.interaction.TouchPan.prototype.handleTouchEnd =
dest = view2D.constrainCenter(dest);
view2D.setCenter(dest);
}
map.requestRenderFrame();
map.render();
return false;
} else {
this.lastCentroid = null;
@@ -123,7 +123,7 @@ ol.interaction.TouchPan.prototype.handleTouchStart =
var view2D = map.getView().getView2D();
goog.asserts.assertInstanceof(view2D, ol.View2D);
this.lastCentroid = null;
map.requestRenderFrame();
map.render();
if (!goog.isNull(this.kineticPreRenderFn_) &&
map.removePreRenderFunction(this.kineticPreRenderFn_)) {
view2D.setCenter(mapBrowserEvent.frameState.view2DState.center);

View File

@@ -107,7 +107,7 @@ ol.interaction.TouchRotate.prototype.handleTouchMove =
// FIXME works for View2D only
var view = map.getView().getView2D();
var view2DState = view.getView2DState();
map.requestRenderFrame();
map.render();
ol.interaction.Interaction.rotateWithoutConstraints(map, view,
view2DState.rotation + rotationDelta, this.anchor_);
}
@@ -147,7 +147,7 @@ ol.interaction.TouchRotate.prototype.handleTouchStart =
this.lastAngle_ = undefined;
this.rotating_ = false;
this.rotationDelta_ = 0.0;
map.requestRenderFrame();
map.render();
return true;
} else {
return false;

View File

@@ -89,7 +89,7 @@ ol.interaction.TouchZoom.prototype.handleTouchMove =
this.anchor_ = map.getCoordinateFromPixel(centroid);
// scale, bypass the resolution constraint
map.requestRenderFrame();
map.render();
ol.interaction.Interaction.zoomWithoutConstraints(
map, view, view2DState.resolution * scaleDelta, this.anchor_);
@@ -129,7 +129,7 @@ ol.interaction.TouchZoom.prototype.handleTouchStart =
this.anchor_ = null;
this.lastDistance_ = undefined;
this.lastScaleDelta_ = 1;
map.requestRenderFrame();
map.render();
return true;
} else {
return false;