ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename olx.View2DState to olx.ViewState and use viewState property

Browse Source
This commit is contained in:
Tim Schaub
2014-06-26 16:38:11 -04:00
parent 2e88f911dd
commit b9f444a008
27 changed files with 146 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/geolocation-orientation.js
View File

@@ -134,7 +134,7 @@ map.beforeRender(function(map, frameState) {
previousM = m;
// interpolate position along positions LineString
var c = positions.getCoordinateAtM(m, true);
var view = frameState.view2DState;
var view = frameState.viewState;
if (c) {
view.center = getCenterWithHeading(c, -c[2], view.resolution);
view.rotation = -c[2];

14
externs/olx.js
View File

@@ -5089,7 +5089,7 @@ olx.View2D.fitGeometryOptions.prototype.minResolution;
* tileQueue: ol.TileQueue,
* time: number,
* usedTiles: Object.<string, Object.<string, ol.TileRange>>,
* view2DState: olx.View2DState,
* viewState: olx.ViewState,
* viewHints: Array.<number>,
* wantedTiles: Object.<string, Object.<string, boolean>>}}
* @todo api
@@ -5105,8 +5105,8 @@ olx.FrameState.prototype.pixelRatio;
olx.FrameState.prototype.time;
/** @type {olx.View2DState} */
olx.FrameState.prototype.view2DState;
/** @type {olx.ViewState} */
olx.FrameState.prototype.viewState;
/**
@@ -5116,16 +5116,16 @@ olx.FrameState.prototype.view2DState;
* rotation: number}}
* @todo api
*/
olx.View2DState;
olx.ViewState;
/** @type {ol.Coordinate} */
olx.View2DState.prototype.center;
olx.ViewState.prototype.center;
/** @type {number} */
olx.View2DState.prototype.resolution;
olx.ViewState.prototype.resolution;
/** @type {number} */
olx.View2DState.prototype.rotation;
olx.ViewState.prototype.rotation;

22
src/ol/animation.js
View File

@@ -29,9 +29,9 @@ ol.animation.bounce = function(options) {
return true;
} else if (frameState.time < start + duration) {
var delta = easing((frameState.time - start) / duration);
var deltaResolution = resolution - frameState.view2DState.resolution;
var deltaResolution = resolution - frameState.viewState.resolution;
frameState.animate = true;
frameState.view2DState.resolution += delta * deltaResolution;
frameState.viewState.resolution += delta * deltaResolution;
frameState.viewHints[ol.ViewHint.ANIMATING] += 1;
return true;
} else {
@@ -66,11 +66,11 @@ ol.animation.pan = function(options) {
return true;
} else if (frameState.time < start + duration) {
var delta = 1 - easing((frameState.time - start) / duration);
var deltaX = sourceX - frameState.view2DState.center[0];
var deltaY = sourceY - frameState.view2DState.center[1];
var deltaX = sourceX - frameState.viewState.center[0];
var deltaY = sourceY - frameState.viewState.center[1];
frameState.animate = true;
frameState.view2DState.center[0] += delta * deltaX;
frameState.view2DState.center[1] += delta * deltaY;
frameState.viewState.center[0] += delta * deltaX;
frameState.viewState.center[1] += delta * deltaY;
frameState.viewHints[ol.ViewHint.ANIMATING] += 1;
return true;
} else {
@@ -107,11 +107,11 @@ ol.animation.rotate = function(options) {
} else if (frameState.time < start + duration) {
var delta = 1 - easing((frameState.time - start) / duration);
var deltaRotation =
(sourceRotation - frameState.view2DState.rotation) * delta;
(sourceRotation - frameState.viewState.rotation) * delta;
frameState.animate = true;
frameState.view2DState.rotation += deltaRotation;
frameState.viewState.rotation += deltaRotation;
if (!goog.isNull(anchor)) {
var center = frameState.view2DState.center;
var center = frameState.viewState.center;
ol.coordinate.sub(center, anchor);
ol.coordinate.rotate(center, deltaRotation);
ol.coordinate.add(center, anchor);
@@ -149,9 +149,9 @@ ol.animation.zoom = function(options) {
} else if (frameState.time < start + duration) {
var delta = 1 - easing((frameState.time - start) / duration);
var deltaResolution =
sourceResolution - frameState.view2DState.resolution;
sourceResolution - frameState.viewState.resolution;
frameState.animate = true;
frameState.view2DState.resolution += delta * deltaResolution;
frameState.viewState.resolution += delta * deltaResolution;
frameState.viewHints[ol.ViewHint.ANIMATING] += 1;
return true;
} else {

4
src/ol/control/mousepositioncontrol.js
View File

@@ -109,8 +109,8 @@ ol.control.MousePosition.prototype.handleMapPostrender = function(mapEvent) {
if (goog.isNull(frameState)) {
this.mapProjection_ = null;
} else {
if (this.mapProjection_ != frameState.view2DState.projection) {
this.mapProjection_ = frameState.view2DState.projection;
if (this.mapProjection_ != frameState.viewState.projection) {
this.mapProjection_ = frameState.viewState.projection;
this.transform_ = null;
}
}

2
src/ol/control/rotatecontrol.js
View File

@@ -145,7 +145,7 @@ ol.control.Rotate.prototype.handleMapPostrender = function(mapEvent) {
if (goog.isNull(frameState)) {
return;
}
var rotation = frameState.view2DState.rotation;
var rotation = frameState.viewState.rotation;
var transform = 'rotate(' + rotation * 360 / (Math.PI * 2) + 'deg)';
if (this.autoHide_) {
this.element.style.opacity = (rotation === 0) ? 0 : 1;

18
src/ol/control/scalelinecontrol.js
View File

@@ -77,9 +77,9 @@ ol.control.ScaleLine = function(opt_options) {
/**
* @private
* @type {?olx.View2DState}
* @type {?olx.ViewState}
*/
this.view2DState_ = null;
this.viewState_ = null;
/**
* @private
@@ -156,9 +156,9 @@ goog.exportProperty(
ol.control.ScaleLine.prototype.handleMapPostrender = function(mapEvent) {
var frameState = mapEvent.frameState;
if (goog.isNull(frameState)) {
this.view2DState_ = null;
this.viewState_ = null;
} else {
this.view2DState_ = frameState.view2DState;
this.viewState_ = frameState.viewState;
}
this.updateElement_();
};
@@ -190,9 +190,9 @@ goog.exportProperty(
* @private
*/
ol.control.ScaleLine.prototype.updateElement_ = function() {
var view2DState = this.view2DState_;
var viewState = this.viewState_;
if (goog.isNull(view2DState)) {
if (goog.isNull(viewState)) {
if (this.renderedVisible_) {
goog.style.setElementShown(this.element_, false);
this.renderedVisible_ = false;
@@ -200,10 +200,10 @@ ol.control.ScaleLine.prototype.updateElement_ = function() {
return;
}
var center = view2DState.center;
var projection = view2DState.projection;
var center = viewState.center;
var projection = viewState.projection;
var pointResolution =
projection.getPointResolution(view2DState.resolution, center);
projection.getPointResolution(viewState.resolution, center);
var projectionUnits = projection.getUnits();
var cosLatitude;

4
src/ol/control/zoomslidercontrol.js
View File

@@ -158,11 +158,11 @@ ol.control.ZoomSlider.prototype.handleMapPostrender = function(mapEvent) {
return;
}
goog.asserts.assert(
goog.isDefAndNotNull(mapEvent.frameState.view2DState));
goog.isDefAndNotNull(mapEvent.frameState.viewState));
if (!this.sliderInitialized_) {
this.initSlider_();
}
var res = mapEvent.frameState.view2DState.resolution;
var res = mapEvent.frameState.viewState.resolution;
if (res !== this.currentResolution_) {
this.currentResolution_ = res;
this.positionThumbForResolution_(res);

2
src/ol/featureoverlay.js
View File

@@ -176,7 +176,7 @@ ol.FeatureOverlay.prototype.handleMapPostCompose_ = function(event) {
goog.asserts.assert(goog.isDef(replayGroup));
var frameState = event.frameState;
var pixelRatio = frameState.pixelRatio;
var resolution = frameState.view2DState.resolution;
var resolution = frameState.viewState.resolution;
var i, ii, styles;
this.features_.forEach(function(feature) {
styles = styleFunction(feature, resolution);

10
src/ol/interaction/dragpaninteraction.js
View File

@@ -75,11 +75,11 @@ ol.interaction.DragPan.prototype.handlePointerDrag = function(mapBrowserEvent) {
var deltaY = centroid[1] - this.lastCentroid[1];
var map = mapBrowserEvent.map;
var view2D = map.getView();
var view2DState = view2D.getState();
var viewState = view2D.getState();
var center = [deltaX, deltaY];
ol.coordinate.scale(center, view2DState.resolution);
ol.coordinate.rotate(center, view2DState.rotation);
ol.coordinate.add(center, view2DState.center);
ol.coordinate.scale(center, viewState.resolution);
ol.coordinate.rotate(center, viewState.rotation);
ol.coordinate.add(center, viewState.center);
center = view2D.constrainCenter(center);
map.render();
view2D.setCenter(center);
@@ -136,7 +136,7 @@ ol.interaction.DragPan.prototype.handlePointerDown =
map.render();
if (!goog.isNull(this.kineticPreRenderFn_) &&
map.removePreRenderFunction(this.kineticPreRenderFn_)) {
view2D.setCenter(mapBrowserEvent.frameState.view2DState.center);
view2D.setCenter(mapBrowserEvent.frameState.viewState.center);
this.kineticPreRenderFn_ = null;
}
if (this.kinetic_) {

12
src/ol/interaction/dragrotateandzoominteraction.js
View File

@@ -81,16 +81,16 @@ ol.interaction.DragRotateAndZoom.prototype.handlePointerDrag =
var theta = Math.atan2(delta.y, delta.x);
var magnitude = delta.magnitude();
var view = map.getView();
var view2DState = view.getState();
var viewState = view.getState();
map.render();
if (goog.isDef(this.lastAngle_)) {
var angleDelta = theta - this.lastAngle_;
ol.interaction.Interaction.rotateWithoutConstraints(
map, view, view2DState.rotation - angleDelta);
map, view, viewState.rotation - angleDelta);
}
this.lastAngle_ = theta;
if (goog.isDef(this.lastMagnitude_)) {
var resolution = this.lastMagnitude_ * (view2DState.resolution / magnitude);
var resolution = this.lastMagnitude_ * (viewState.resolution / magnitude);
ol.interaction.Interaction.zoomWithoutConstraints(map, view, resolution);
}
if (goog.isDef(this.lastMagnitude_)) {
@@ -112,10 +112,10 @@ ol.interaction.DragRotateAndZoom.prototype.handlePointerUp =
var map = mapBrowserEvent.map;
var view = map.getView();
view.setHint(ol.ViewHint.INTERACTING, -1);
var view2DState = view.getState();
var viewState = view.getState();
var direction = this.lastScaleDelta_ - 1;
ol.interaction.Interaction.rotate(map, view, view2DState.rotation);
ol.interaction.Interaction.zoom(map, view, view2DState.resolution,
ol.interaction.Interaction.rotate(map, view, viewState.rotation);
ol.interaction.Interaction.zoom(map, view, viewState.resolution,
undefined, ol.DRAGROTATEANDZOOM_ANIMATION_DURATION,
direction);
this.lastScaleDelta_ = 0;

8
src/ol/interaction/dragrotateinteraction.js
View File

@@ -63,10 +63,10 @@ ol.interaction.DragRotate.prototype.handlePointerDrag =
if (goog.isDef(this.lastAngle_)) {
var delta = theta - this.lastAngle_;
var view = map.getView();
var view2DState = view.getState();
var viewState = view.getState();
map.render();
ol.interaction.Interaction.rotateWithoutConstraints(
map, view, view2DState.rotation - delta);
map, view, viewState.rotation - delta);
}
this.lastAngle_ = theta;
};
@@ -84,8 +84,8 @@ ol.interaction.DragRotate.prototype.handlePointerUp =
var map = mapBrowserEvent.map;
var view = map.getView();
view.setHint(ol.ViewHint.INTERACTING, -1);
var view2DState = view.getState();
ol.interaction.Interaction.rotate(map, view, view2DState.rotation,
var viewState = view.getState();
ol.interaction.Interaction.rotate(map, view, viewState.rotation,
undefined, ol.DRAGROTATE_ANIMATION_DURATION);
return false;
};

6
src/ol/interaction/keyboardpaninteraction.js
View File

@@ -71,8 +71,8 @@ ol.interaction.KeyboardPan.prototype.handleMapBrowserEvent =
var map = mapBrowserEvent.map;
var view = map.getView();
goog.asserts.assert(goog.isDef(view));
var view2DState = view.getState();
var mapUnitsDelta = view2DState.resolution * this.pixelDelta_;
var viewState = view.getState();
var mapUnitsDelta = viewState.resolution * this.pixelDelta_;
var deltaX = 0, deltaY = 0;
if (keyCode == goog.events.KeyCodes.DOWN) {
deltaY = -mapUnitsDelta;
@@ -84,7 +84,7 @@ ol.interaction.KeyboardPan.prototype.handleMapBrowserEvent =
deltaY = mapUnitsDelta;
}
var delta = [deltaX, deltaY];
ol.coordinate.rotate(delta, view2DState.rotation);
ol.coordinate.rotate(delta, viewState.rotation);
ol.interaction.Interaction.pan(
map, view, delta, ol.KEYBOARD_PAN_DURATION);
mapBrowserEvent.preventDefault();

8
src/ol/interaction/pinchrotateinteraction.js
View File

@@ -102,10 +102,10 @@ ol.interaction.PinchRotate.prototype.handlePointerDrag =
// rotate
if (this.rotating_) {
var view = map.getView();
var view2DState = view.getState();
var viewState = view.getState();
map.render();
ol.interaction.Interaction.rotateWithoutConstraints(map, view,
view2DState.rotation + rotationDelta, this.anchor_);
viewState.rotation + rotationDelta, this.anchor_);
}
};
@@ -120,9 +120,9 @@ ol.interaction.PinchRotate.prototype.handlePointerUp =
var view = map.getView();
view.setHint(ol.ViewHint.INTERACTING, -1);
if (this.rotating_) {
var view2DState = view.getState();
var viewState = view.getState();
ol.interaction.Interaction.rotate(
map, view, view2DState.rotation, this.anchor_,
map, view, viewState.rotation, this.anchor_,
ol.ROTATE_ANIMATION_DURATION);
}
return false;

8
src/ol/interaction/pinchzoominteraction.js
View File

@@ -79,7 +79,7 @@ ol.interaction.PinchZoom.prototype.handlePointerDrag =
var map = mapBrowserEvent.map;
var view = map.getView();
var view2DState = view.getState();
var viewState = view.getState();
// scale anchor point.
var viewportPosition = goog.style.getClientPosition(map.getViewport());
@@ -92,7 +92,7 @@ ol.interaction.PinchZoom.prototype.handlePointerDrag =
// scale, bypass the resolution constraint
map.render();
ol.interaction.Interaction.zoomWithoutConstraints(
map, view, view2DState.resolution * scaleDelta, this.anchor_);
map, view, viewState.resolution * scaleDelta, this.anchor_);
};
@@ -106,12 +106,12 @@ ol.interaction.PinchZoom.prototype.handlePointerUp =
var map = mapBrowserEvent.map;
var view = map.getView();
view.setHint(ol.ViewHint.INTERACTING, -1);
var view2DState = view.getState();
var viewState = view.getState();
// Zoom to final resolution, with an animation, and provide a
// direction not to zoom out/in if user was pinching in/out.
// Direction is > 0 if pinching out, and < 0 if pinching in.
var direction = this.lastScaleDelta_ - 1;
ol.interaction.Interaction.zoom(map, view, view2DState.resolution,
ol.interaction.Interaction.zoom(map, view, viewState.resolution,
this.anchor_, this.duration_, direction);
return false;
} else {

12
src/ol/map.js
View File

@@ -1164,7 +1164,7 @@ ol.Map.prototype.removeOverlay = function(overlay) {
*/
ol.Map.prototype.renderFrame_ = function(time) {
var i, ii, view2DState;
var i, ii, viewState;
/**
* Check whether a size has non-zero width and height. Note that this
@@ -1192,13 +1192,13 @@ ol.Map.prototype.renderFrame_ = function(time) {
for (i = 0, ii = layerStatesArray.length; i < ii; ++i) {
layerStates[goog.getUid(layerStatesArray[i].layer)] = layerStatesArray[i];
}
view2DState = view.getState();
viewState = view.getState();
frameState = /** @type {olx.FrameState} */ ({
animate: false,
attributions: {},
coordinateToPixelMatrix: this.coordinateToPixelMatrix_,
extent: null,
focus: goog.isNull(this.focus_) ? view2DState.center : this.focus_,
focus: goog.isNull(this.focus_) ? viewState.center : this.focus_,
index: this.frameIndex_++,
layerStates: layerStates,
layerStatesArray: layerStatesArray,
@@ -1211,7 +1211,7 @@ ol.Map.prototype.renderFrame_ = function(time) {
tileQueue: this.tileQueue_,
time: time,
usedTiles: {},
view2DState: view2DState,
viewState: viewState,
viewHints: viewHints,
wantedTiles: {}
});
@@ -1231,8 +1231,8 @@ ol.Map.prototype.renderFrame_ = function(time) {
preRenderFunctions.length = n;
if (!goog.isNull(frameState)) {
frameState.extent = ol.extent.getForView2DAndSize(view2DState.center,
view2DState.resolution, view2DState.rotation, frameState.size);
frameState.extent = ol.extent.getForView2DAndSize(viewState.center,
viewState.resolution, viewState.rotation, frameState.size);
}
this.frameState_ = frameState;

14
src/ol/renderer/canvas/canvasimagelayerrenderer.js
View File

@@ -50,8 +50,8 @@ ol.renderer.canvas.ImageLayer.prototype.forEachFeatureAtPixel =
var source = layer.getSource();
goog.asserts.assertInstanceof(source, ol.source.Image);
var extent = frameState.extent;
var resolution = frameState.view2DState.resolution;
var rotation = frameState.view2DState.rotation;
var resolution = frameState.viewState.resolution;
var rotation = frameState.viewState.rotation;
var skippedFeatureUids = frameState.skippedFeatureUids_;
return source.forEachFeatureAtPixel(
extent, resolution, rotation, coordinate, skippedFeatureUids,
@@ -89,10 +89,10 @@ ol.renderer.canvas.ImageLayer.prototype.prepareFrame =
function(frameState, layerState) {
var pixelRatio = frameState.pixelRatio;
var view2DState = frameState.view2DState;
var viewCenter = view2DState.center;
var viewResolution = view2DState.resolution;
var viewRotation = view2DState.rotation;
var viewState = frameState.viewState;
var viewCenter = viewState.center;
var viewResolution = viewState.resolution;
var viewRotation = viewState.rotation;
var image;
var imageLayer = this.getLayer();
@@ -104,7 +104,7 @@ ol.renderer.canvas.ImageLayer.prototype.prepareFrame =
if (!hints[ol.ViewHint.ANIMATING] && !hints[ol.ViewHint.INTERACTING]) {
image = imageSource.getImage(
frameState.extent, viewResolution, pixelRatio, view2DState.projection);
frameState.extent, viewResolution, pixelRatio, viewState.projection);
if (!goog.isNull(image)) {
var imageState = image.getState();
if (imageState == ol.ImageState.IDLE) {

14
src/ol/renderer/canvas/canvaslayerrenderer.js
View File

@@ -49,7 +49,7 @@ ol.renderer.canvas.Layer.prototype.composeFrame =
// for performance reasons, context.setTransform is only used
// when the view is rotated. see http://jsperf.com/canvas-transform
if (frameState.view2DState.rotation === 0) {
if (frameState.viewState.rotation === 0) {
var dx = goog.vec.Mat4.getElement(imageTransform, 0, 3);
var dy = goog.vec.Mat4.getElement(imageTransform, 1, 3);
var dw = image.width * goog.vec.Mat4.getElement(imageTransform, 0, 0);
@@ -89,7 +89,7 @@ ol.renderer.canvas.Layer.prototype.dispatchComposeEvent_ =
opt_transform : this.getTransform(frameState);
var render = new ol.render.canvas.Immediate(
context, frameState.pixelRatio, frameState.extent, transform,
frameState.view2DState.rotation);
frameState.viewState.rotation);
var composeEvent = new ol.render.Event(type, layer, render, null,
frameState, context, null);
layer.dispatchEvent(composeEvent);
@@ -155,15 +155,15 @@ ol.renderer.canvas.Layer.prototype.getImageTransform = goog.abstractMethod;
* @return {!goog.vec.Mat4.Number} Transform.
*/
ol.renderer.canvas.Layer.prototype.getTransform = function(frameState) {
var view2DState = frameState.view2DState;
var viewState = frameState.viewState;
var pixelRatio = frameState.pixelRatio;
return ol.vec.Mat4.makeTransform2D(this.transform_,
pixelRatio * frameState.size[0] / 2,
pixelRatio * frameState.size[1] / 2,
pixelRatio / view2DState.resolution,
-pixelRatio / view2DState.resolution,
-view2DState.rotation,
-view2DState.center[0], -view2DState.center[1]);
pixelRatio / viewState.resolution,
-pixelRatio / viewState.resolution,
-viewState.rotation,
-viewState.center[0], -viewState.center[1]);
};

16
src/ol/renderer/canvas/canvasmaprenderer.js
View File

@@ -101,16 +101,16 @@ ol.renderer.canvas.Map.prototype.dispatchComposeEvent_ =
if (map.hasListener(type)) {
var extent = frameState.extent;
var pixelRatio = frameState.pixelRatio;
var view2DState = frameState.view2DState;
var resolution = view2DState.resolution;
var rotation = view2DState.rotation;
var viewState = frameState.viewState;
var resolution = viewState.resolution;
var rotation = viewState.rotation;
ol.vec.Mat4.makeTransform2D(this.transform_,
this.canvas_.width / 2,
this.canvas_.height / 2,
pixelRatio / view2DState.resolution,
-pixelRatio / view2DState.resolution,
-view2DState.rotation,
-view2DState.center[0], -view2DState.center[1]);
pixelRatio / viewState.resolution,
-pixelRatio / viewState.resolution,
-viewState.rotation,
-viewState.center[0], -viewState.center[1]);
var vectorContext = new ol.render.canvas.Immediate(context, pixelRatio,
extent, this.transform_, rotation);
var replayGroup = new ol.render.canvas.ReplayGroup(
@@ -177,7 +177,7 @@ ol.renderer.canvas.Map.prototype.renderFrame = function(frameState) {
this.dispatchComposeEvent_(ol.render.EventType.PRECOMPOSE, frameState);
var layerStatesArray = frameState.layerStatesArray;
var viewResolution = frameState.view2DState.resolution;
var viewResolution = frameState.viewState.resolution;
var i, ii, layer, layerRenderer, layerState;
for (i = 0, ii = layerStatesArray.length; i < ii; ++i) {
layerState = layerStatesArray[i];

18
src/ol/renderer/canvas/canvastilelayerrenderer.js
View File

@@ -170,8 +170,8 @@ ol.renderer.canvas.TileLayer.prototype.prepareFrame =
//
var pixelRatio = frameState.pixelRatio;
var view2DState = frameState.view2DState;
var projection = view2DState.projection;
var viewState = frameState.viewState;
var projection = viewState.projection;
var tileLayer = this.getLayer();
goog.asserts.assertInstanceof(tileLayer, ol.layer.Tile);
@@ -179,18 +179,18 @@ ol.renderer.canvas.TileLayer.prototype.prepareFrame =
goog.asserts.assertInstanceof(tileSource, ol.source.Tile);
var tileGrid = tileSource.getTileGridForProjection(projection);
var tileGutter = tileSource.getGutter();
var z = tileGrid.getZForResolution(view2DState.resolution);
var z = tileGrid.getZForResolution(viewState.resolution);
var tilePixelSize =
tileSource.getTilePixelSize(z, frameState.pixelRatio, projection);
var tilePixelRatio = tilePixelSize / tileGrid.getTileSize(z);
var tileResolution = tileGrid.getResolution(z);
var tilePixelResolution = tileResolution / tilePixelRatio;
var center = view2DState.center;
var center = viewState.center;
var extent;
if (tileResolution == view2DState.resolution) {
if (tileResolution == viewState.resolution) {
center = this.snapCenterToPixel(center, tileResolution, frameState.size);
extent = ol.extent.getForView2DAndSize(
center, tileResolution, view2DState.rotation, frameState.size);
center, tileResolution, viewState.rotation, frameState.size);
} else {
extent = frameState.extent;
}
@@ -400,9 +400,9 @@ ol.renderer.canvas.TileLayer.prototype.prepareFrame =
ol.vec.Mat4.makeTransform2D(this.imageTransform_,
pixelRatio * frameState.size[0] / 2,
pixelRatio * frameState.size[1] / 2,
pixelRatio * tilePixelResolution / view2DState.resolution,
pixelRatio * tilePixelResolution / view2DState.resolution,
view2DState.rotation,
pixelRatio * tilePixelResolution / viewState.resolution,
pixelRatio * tilePixelResolution / viewState.resolution,
viewState.rotation,
(origin[0] - center[0]) / tilePixelResolution,
(center[1] - origin[1]) / tilePixelResolution);

12
src/ol/renderer/canvas/canvasvectorlayerrenderer.js
View File

@@ -97,7 +97,7 @@ ol.renderer.canvas.VectorLayer.prototype.composeFrame =
replayContext.globalAlpha = layerState.opacity;
replayGroup.replay(
replayContext, frameState.extent, frameState.pixelRatio, transform,
frameState.view2DState.rotation, frameState.skippedFeatureUids_);
frameState.viewState.rotation, frameState.skippedFeatureUids_);
if (replayContext != context) {
this.dispatchRenderEvent(replayContext, frameState, transform);
@@ -119,8 +119,8 @@ ol.renderer.canvas.VectorLayer.prototype.forEachFeatureAtPixel =
return undefined;
} else {
var extent = frameState.extent;
var resolution = frameState.view2DState.resolution;
var rotation = frameState.view2DState.rotation;
var resolution = frameState.viewState.resolution;
var rotation = frameState.viewState.rotation;
var layer = this.getLayer();
return this.replayGroup_.forEachGeometryAtPixel(extent, resolution,
rotation, coordinate, frameState.skippedFeatureUids_,
@@ -170,9 +170,9 @@ ol.renderer.canvas.VectorLayer.prototype.prepareFrame =
}
var frameStateExtent = frameState.extent;
var view2DState = frameState.view2DState;
var projection = view2DState.projection;
var resolution = view2DState.resolution;
var viewState = frameState.viewState;
var projection = viewState.projection;
var resolution = viewState.resolution;
var pixelRatio = frameState.pixelRatio;
var vectorLayerRevision = vectorLayer.getRevision();
var vectorLayerRenderOrder = vectorLayer.getRenderOrder();

14
src/ol/renderer/dom/domimagelayerrenderer.js
View File

@@ -55,8 +55,8 @@ ol.renderer.dom.ImageLayer.prototype.forEachFeatureAtPixel =
var source = layer.getSource();
goog.asserts.assertInstanceof(source, ol.source.Image);
var extent = frameState.extent;
var resolution = frameState.view2DState.resolution;
var rotation = frameState.view2DState.rotation;
var resolution = frameState.viewState.resolution;
var rotation = frameState.viewState.rotation;
var skippedFeatureUids = frameState.skippedFeatureUids_;
return source.forEachFeatureAtPixel(
extent, resolution, rotation, coordinate, skippedFeatureUids,
@@ -76,10 +76,10 @@ ol.renderer.dom.ImageLayer.prototype.forEachFeatureAtPixel =
ol.renderer.dom.ImageLayer.prototype.prepareFrame =
function(frameState, layerState) {
var view2DState = frameState.view2DState;
var viewCenter = view2DState.center;
var viewResolution = view2DState.resolution;
var viewRotation = view2DState.rotation;
var viewState = frameState.viewState;
var viewCenter = viewState.center;
var viewResolution = viewState.resolution;
var viewRotation = viewState.rotation;
var image = this.image_;
var imageLayer = this.getLayer();
@@ -91,7 +91,7 @@ ol.renderer.dom.ImageLayer.prototype.prepareFrame =
if (!hints[ol.ViewHint.ANIMATING] && !hints[ol.ViewHint.INTERACTING]) {
var image_ = imageSource.getImage(frameState.extent, viewResolution,
frameState.pixelRatio, view2DState.projection);
frameState.pixelRatio, viewState.projection);
if (!goog.isNull(image_)) {
var imageState = image_.getState();
if (imageState == ol.ImageState.IDLE) {

18
src/ol/renderer/dom/domtilelayerrenderer.js
View File

@@ -90,8 +90,8 @@ ol.renderer.dom.TileLayer.prototype.prepareFrame =
}
var pixelRatio = frameState.pixelRatio;
var view2DState = frameState.view2DState;
var projection = view2DState.projection;
var viewState = frameState.viewState;
var projection = viewState.projection;
var tileLayer = this.getLayer();
goog.asserts.assertInstanceof(tileLayer, ol.layer.Tile);
@@ -99,14 +99,14 @@ ol.renderer.dom.TileLayer.prototype.prepareFrame =
goog.asserts.assertInstanceof(tileSource, ol.source.Tile);
var tileGrid = tileSource.getTileGridForProjection(projection);
var tileGutter = tileSource.getGutter();
var z = tileGrid.getZForResolution(view2DState.resolution);
var z = tileGrid.getZForResolution(viewState.resolution);
var tileResolution = tileGrid.getResolution(z);
var center = view2DState.center;
var center = viewState.center;
var extent;
if (tileResolution == view2DState.resolution) {
if (tileResolution == viewState.resolution) {
center = this.snapCenterToPixel(center, tileResolution, frameState.size);
extent = ol.extent.getForView2DAndSize(
center, tileResolution, view2DState.rotation, frameState.size);
center, tileResolution, viewState.rotation, frameState.size);
} else {
extent = frameState.extent;
}
@@ -217,9 +217,9 @@ ol.renderer.dom.TileLayer.prototype.prepareFrame =
origin = tileLayerZ.getOrigin();
ol.vec.Mat4.makeTransform2D(transform,
frameState.size[0] / 2, frameState.size[1] / 2,
resolution / view2DState.resolution,
resolution / view2DState.resolution,
view2DState.rotation,
resolution / viewState.resolution,
resolution / viewState.resolution,
viewState.rotation,
(origin[0] - center[0]) / resolution,
(center[1] - origin[1]) / resolution);
tileLayerZ.setTransform(transform);

14
src/ol/renderer/maprenderer.js
View File

@@ -64,14 +64,14 @@ goog.inherits(ol.renderer.Map, goog.Disposable);
* @protected
*/
ol.renderer.Map.prototype.calculateMatrices2D = function(frameState) {
var view2DState = frameState.view2DState;
var viewState = frameState.viewState;
var coordinateToPixelMatrix = frameState.coordinateToPixelMatrix;
goog.asserts.assert(!goog.isNull(coordinateToPixelMatrix));
ol.vec.Mat4.makeTransform2D(coordinateToPixelMatrix,
frameState.size[0] / 2, frameState.size[1] / 2,
1 / view2DState.resolution, -1 / view2DState.resolution,
-view2DState.rotation,
-view2DState.center[0], -view2DState.center[1]);
1 / viewState.resolution, -1 / viewState.resolution,
-viewState.rotation,
-viewState.center[0], -viewState.center[1]);
var inverted = goog.vec.Mat4.invert(
coordinateToPixelMatrix, frameState.pixelToCoordinateMatrix);
goog.asserts.assert(inverted);
@@ -118,9 +118,9 @@ ol.renderer.Map.prototype.forEachFeatureAtPixel =
layerFilter, thisArg2) {
var result;
var extent = frameState.extent;
var view2DState = frameState.view2DState;
var viewResolution = view2DState.resolution;
var viewRotation = view2DState.rotation;
var viewState = frameState.viewState;
var viewResolution = viewState.resolution;
var viewRotation = viewState.rotation;
if (!goog.isNull(this.replayGroup)) {
/** @type {Object.<string, boolean>} */
var features = {};

14
src/ol/renderer/webgl/webglimagelayerrenderer.js
View File

@@ -81,8 +81,8 @@ ol.renderer.webgl.ImageLayer.prototype.forEachFeatureAtPixel =
var source = layer.getSource();
goog.asserts.assertInstanceof(source, ol.source.Image);
var extent = frameState.extent;
var resolution = frameState.view2DState.resolution;
var rotation = frameState.view2DState.rotation;
var resolution = frameState.viewState.resolution;
var rotation = frameState.viewState.rotation;
var skippedFeatureUids = frameState.skippedFeatureUids_;
return source.forEachFeatureAtPixel(
extent, resolution, rotation, coordinate, skippedFeatureUids,
@@ -105,10 +105,10 @@ ol.renderer.webgl.ImageLayer.prototype.prepareFrame =
var gl = this.getWebGLMapRenderer().getGL();
var view2DState = frameState.view2DState;
var viewCenter = view2DState.center;
var viewResolution = view2DState.resolution;
var viewRotation = view2DState.rotation;
var viewState = frameState.viewState;
var viewCenter = viewState.center;
var viewResolution = viewState.resolution;
var viewRotation = viewState.rotation;
var image = this.image_;
var texture = this.texture;
@@ -121,7 +121,7 @@ ol.renderer.webgl.ImageLayer.prototype.prepareFrame =
if (!hints[ol.ViewHint.ANIMATING] && !hints[ol.ViewHint.INTERACTING]) {
var image_ = imageSource.getImage(frameState.extent, viewResolution,
frameState.pixelRatio, view2DState.projection);
frameState.pixelRatio, viewState.projection);
if (!goog.isNull(image_)) {
var imageState = image_.getState();
if (imageState == ol.ImageState.IDLE) {

2
src/ol/renderer/webgl/webglmaprenderer.js
View File

@@ -448,7 +448,7 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
/** @type {Array.<ol.layer.LayerState>} */
var layerStatesToDraw = [];
var layerStatesArray = frameState.layerStatesArray;
var viewResolution = frameState.view2DState.resolution;
var viewResolution = frameState.viewState.resolution;
var i, ii, layerState;
for (i = 0, ii = layerStatesArray.length; i < ii; ++i) {
layerState = layerStatesArray[i];

20
src/ol/renderer/webgl/webgltilelayerrenderer.js
View File

@@ -114,15 +114,15 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame =
var context = mapRenderer.getContext();
var gl = mapRenderer.getGL();
var view2DState = frameState.view2DState;
var projection = view2DState.projection;
var viewState = frameState.viewState;
var projection = viewState.projection;
var tileLayer = this.getLayer();
goog.asserts.assertInstanceof(tileLayer, ol.layer.Tile);
var tileSource = tileLayer.getSource();
goog.asserts.assertInstanceof(tileSource, ol.source.Tile);
var tileGrid = tileSource.getTileGridForProjection(projection);
var z = tileGrid.getZForResolution(view2DState.resolution);
var z = tileGrid.getZForResolution(viewState.resolution);
var tileResolution = tileGrid.getResolution(z);
var tilePixelSize =
@@ -131,12 +131,12 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame =
var tilePixelResolution = tileResolution / pixelRatio;
var tileGutter = tileSource.getGutter();
var center = view2DState.center;
var center = viewState.center;
var extent;
if (tileResolution == view2DState.resolution) {
if (tileResolution == viewState.resolution) {
center = this.snapCenterToPixel(center, tileResolution, frameState.size);
extent = ol.extent.getForView2DAndSize(
center, tileResolution, view2DState.rotation, frameState.size);
center, tileResolution, viewState.rotation, frameState.size);
} else {
extent = frameState.extent;
}
@@ -310,13 +310,13 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame =
(center[1] - framebufferExtent[1]) /
(framebufferExtent[3] - framebufferExtent[1]),
0);
if (view2DState.rotation !== 0) {
goog.vec.Mat4.rotateZ(texCoordMatrix, view2DState.rotation);
if (viewState.rotation !== 0) {
goog.vec.Mat4.rotateZ(texCoordMatrix, viewState.rotation);
}
goog.vec.Mat4.scale(texCoordMatrix,
frameState.size[0] * view2DState.resolution /
frameState.size[0] * viewState.resolution /
(framebufferExtent[2] - framebufferExtent[0]),
frameState.size[1] * view2DState.resolution /
frameState.size[1] * viewState.resolution /
(framebufferExtent[3] - framebufferExtent[1]),
1);
goog.vec.Mat4.translate(texCoordMatrix,

4
src/ol/view2d.js
View File

@@ -385,7 +385,7 @@ ol.View2D.prototype.getValueForResolutionFunction = function(opt_power) {
/**
* @return {olx.View2DState} View2D state.
* @return {olx.ViewState} View2D state.
*/
ol.View2D.prototype.getState = function() {
goog.asserts.assert(this.isDef());
@@ -393,7 +393,7 @@ ol.View2D.prototype.getState = function() {
var projection = this.getProjection();
var resolution = /** @type {number} */ (this.getResolution());
var rotation = this.getRotation();
return /** @type {olx.View2DState} */ ({
return /** @type {olx.ViewState} */ ({
center: center.slice(),
projection: goog.isDef(projection) ? projection : null,
resolution: resolution,