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
src/ol/renderer/dom/domimagelayerrenderer.js
+7 -7
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) {
src/ol/renderer/dom/domtilelayerrenderer.js
+9 -9
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);