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

Rename devicePixelRatio to pixelRatio in ol.FrameState

Browse Source
This commit is contained in:
Tom Payne
2014-01-14 15:30:49 +01:00
parent 50a322208a
commit 4667dec7c3
12 changed files with 36 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/objectliterals.jsdoc
View File

@@ -25,7 +25,7 @@
* @typedef {Object} olx.MapOptions
* @property {ol.Collection|Array.<ol.control.Control>|undefined} controls
* Controls initially added to the map.
* @property {number|undefined} devicePixelRatio The ratio between physical
* @property {number|undefined} pixelRatio The ratio between physical
* pixels and device-independent pixels (dips) on the device. If `undefined`
* then it gets set by using `window.devicePixelRatio`.
* @property {ol.Collection|Array.<ol.interaction.Interaction>|undefined} interactions
@@ -566,7 +566,7 @@
* @property {number|undefined} displayDpi The display resolution. Default is `96`.
* @property {number|undefined} metersPerUnit The meters-per-unit value. Default is `1`.
* @property {ol.Extent|undefined} extent Extent.
* @property {boolean|undefined} hidpi Use the `ol.Map#devicePixelRatio` value when
* @property {boolean|undefined} hidpi Use the `ol.Map#pixelRatio` value when
* requesting the image from the remote server. Default is `true`.
* @property {boolean|undefined} useOverlay If `true`, will use
* `GETDYNAMICMAPOVERLAYIMAGE`.
@@ -662,7 +662,7 @@
* @property {null|string|undefined} crossOrigin crossOrigin setting for image
* requests.
* @property {ol.Extent|undefined} extent Extent.
* @property {boolean|undefined} hidpi Use the `ol.Map#devicePixelRatio` value when
* @property {boolean|undefined} hidpi Use the `ol.Map#pixelRatio` value when
* requesting the image from the remote server. Default is `true`.
* @property {ol.source.wms.ServerType|undefined} serverType The type of the remote WMS
* server: `mapserver`, `geoserver` or `qgis`. Only needed if `hidpi` is `true`.

2
src/ol/framestate.js
View File

@@ -20,13 +20,13 @@ goog.require('ol.layer.LayerState');
* @typedef {{animate: boolean,
* attributions: Object.<string, ol.Attribution>,
* coordinateToPixelMatrix: goog.vec.Mat4.Number,
* devicePixelRatio: number,
* extent: (null|ol.Extent),
* focus: ol.Coordinate,
* index: number,
* layersArray: Array.<ol.layer.Layer>,
* layerStates: Object.<number, ol.layer.LayerState>,
* logos: Object.<string, string>,
* pixelRatio: number,
* pixelToCoordinateMatrix: goog.vec.Mat4.Number,
* postRenderFunctions: Array.<ol.PostRenderFunction>,
* size: ol.Size,

6
src/ol/map.js
View File

@@ -175,8 +175,8 @@ ol.Map = function(options) {
* @private
* @type {number}
*/
this.devicePixelRatio_ = goog.isDef(options.devicePixelRatio) ?
options.devicePixelRatio : ol.BrowserFeature.DEVICE_PIXEL_RATIO;
this.pixelRatio_ = goog.isDef(options.pixelRatio) ?
options.pixelRatio : ol.BrowserFeature.DEVICE_PIXEL_RATIO;
/**
* @private
@@ -1115,13 +1115,13 @@ ol.Map.prototype.renderFrame_ = function(time) {
animate: false,
attributions: {},
coordinateToPixelMatrix: this.coordinateToPixelMatrix_,
devicePixelRatio: this.devicePixelRatio_,
extent: null,
focus: goog.isNull(this.focus_) ? view2DState.center : this.focus_,
index: this.frameIndex_++,
layersArray: layersArray,
layerStates: layerStates,
logos: {},
pixelRatio: this.pixelRatio_,
pixelToCoordinateMatrix: this.pixelToCoordinateMatrix_,
postRenderFunctions: [],
size: size,

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

@@ -86,7 +86,7 @@ ol.renderer.canvas.ImageLayer.prototype.getImageTransform = function() {
ol.renderer.canvas.ImageLayer.prototype.prepareFrame =
function(frameState, layerState) {
var devicePixelRatio = frameState.devicePixelRatio;
var pixelRatio = frameState.pixelRatio;
var view2DState = frameState.view2DState;
var viewCenter = view2DState.center;
var viewResolution = view2DState.resolution;
@@ -101,8 +101,8 @@ ol.renderer.canvas.ImageLayer.prototype.prepareFrame =
var hints = frameState.viewHints;
if (!hints[ol.ViewHint.ANIMATING] && !hints[ol.ViewHint.INTERACTING]) {
image = imageSource.getImage(frameState.extent, viewResolution,
devicePixelRatio, view2DState.projection);
image = imageSource.getImage(
frameState.extent, viewResolution, pixelRatio, view2DState.projection);
if (!goog.isNull(image)) {
var imageState = image.getState();
if (imageState == ol.ImageState.IDLE) {
@@ -120,11 +120,11 @@ ol.renderer.canvas.ImageLayer.prototype.prepareFrame =
var imageExtent = image.getExtent();
var imageResolution = image.getResolution();
var imagePixelRatio = image.getPixelRatio();
var scale = devicePixelRatio * imageResolution /
var scale = pixelRatio * imageResolution /
(viewResolution * imagePixelRatio);
ol.vec.Mat4.makeTransform2D(this.imageTransform_,
devicePixelRatio * frameState.size[0] / 2,
devicePixelRatio * frameState.size[1] / 2,
pixelRatio * frameState.size[0] / 2,
pixelRatio * frameState.size[1] / 2,
scale, scale,
viewRotation,
imagePixelRatio * (imageExtent[0] - viewCenter[0]) / imageResolution,

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

@@ -86,7 +86,7 @@ ol.renderer.canvas.Layer.prototype.dispatchComposeEvent_ =
var transform = goog.isDef(opt_transform) ?
opt_transform : this.getTransform(frameState);
var render = new ol.render.canvas.Immediate(
context, frameState.devicePixelRatio, frameState.extent, transform);
context, frameState.pixelRatio, frameState.extent, transform);
var composeEvent = new ol.render.Event(type, layer, render, frameState,
context, null);
layer.dispatchEvent(composeEvent);
@@ -140,12 +140,12 @@ ol.renderer.canvas.Layer.prototype.getImageTransform = goog.abstractMethod;
*/
ol.renderer.canvas.Layer.prototype.getTransform = function(frameState) {
var view2DState = frameState.view2DState;
var devicePixelRatio = frameState.devicePixelRatio;
var pixelRatio = frameState.pixelRatio;
return ol.vec.Mat4.makeTransform2D(this.transform_,
devicePixelRatio * frameState.size[0] / 2,
devicePixelRatio * frameState.size[1] / 2,
devicePixelRatio / view2DState.resolution,
-devicePixelRatio / view2DState.resolution,
pixelRatio * frameState.size[0] / 2,
pixelRatio * frameState.size[1] / 2,
pixelRatio / view2DState.resolution,
-pixelRatio / view2DState.resolution,
-view2DState.rotation,
-view2DState.center[0], -view2DState.center[1]);
};

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

@@ -96,16 +96,16 @@ ol.renderer.canvas.Map.prototype.dispatchComposeEvent_ =
var context = this.context_;
if (map.hasListener(type)) {
var view2DState = frameState.view2DState;
var devicePixelRatio = frameState.devicePixelRatio;
var pixelRatio = frameState.pixelRatio;
ol.vec.Mat4.makeTransform2D(this.transform_,
this.canvas_.width / 2,
this.canvas_.height / 2,
devicePixelRatio / view2DState.resolution,
-devicePixelRatio / view2DState.resolution,
pixelRatio / view2DState.resolution,
-pixelRatio / view2DState.resolution,
-view2DState.rotation,
-view2DState.center[0], -view2DState.center[1]);
var render = new ol.render.canvas.Immediate(
context, devicePixelRatio, frameState.extent, this.transform_);
context, pixelRatio, frameState.extent, this.transform_);
var composeEvent = new ol.render.Event(type, map, render, frameState,
context, null);
map.dispatchEvent(composeEvent);
@@ -139,9 +139,8 @@ ol.renderer.canvas.Map.prototype.renderFrame = function(frameState) {
}
var context = this.context_;
var ratio = frameState.devicePixelRatio;
var width = frameState.size[0] * ratio;
var height = frameState.size[1] * ratio;
var width = frameState.size[0] * frameState.pixelRatio;
var height = frameState.size[1] * frameState.pixelRatio;
if (this.canvas_.width != width || this.canvas_.height != height) {
this.canvas_.width = width;
this.canvas_.height = height;

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

@@ -382,12 +382,12 @@ ol.renderer.canvas.TileLayer.prototype.prepareFrame =
this.scheduleExpireCache(frameState, tileSource);
this.updateLogos(frameState, tileSource);
var devicePixelRatio = frameState.devicePixelRatio;
var pixelRatio = frameState.pixelRatio;
ol.vec.Mat4.makeTransform2D(this.imageTransform_,
devicePixelRatio * frameState.size[0] / 2,
devicePixelRatio * frameState.size[1] / 2,
devicePixelRatio * tileResolution / view2DState.resolution,
devicePixelRatio * tileResolution / view2DState.resolution,
pixelRatio * frameState.size[0] / 2,
pixelRatio * frameState.size[1] / 2,
pixelRatio * tileResolution / view2DState.resolution,
pixelRatio * tileResolution / view2DState.resolution,
view2DState.rotation,
(origin[0] - center[0]) / tileResolution,
(center[1] - origin[1]) / tileResolution);

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

@@ -76,7 +76,7 @@ ol.renderer.canvas.VectorLayer.prototype.composeFrame =
goog.asserts.assert(goog.isFunction(renderGeometryFunction));
context.globalAlpha = layerState.opacity;
replayGroup.replay(
context, frameState.extent, frameState.devicePixelRatio, transform,
context, frameState.extent, frameState.pixelRatio, transform,
renderGeometryFunction);
}
@@ -168,7 +168,7 @@ ol.renderer.canvas.VectorLayer.prototype.prepareFrame =
var frameStateExtent = frameState.extent;
var frameStateResolution = frameState.view2DState.resolution;
var pixelRatio = frameState.devicePixelRatio;
var pixelRatio = frameState.pixelRatio;
if (!this.dirty_ &&
this.renderedResolution_ == frameStateResolution &&

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

@@ -89,7 +89,7 @@ ol.renderer.dom.ImageLayer.prototype.prepareFrame =
if (!hints[ol.ViewHint.ANIMATING] && !hints[ol.ViewHint.INTERACTING]) {
var image_ = imageSource.getImage(frameState.extent, viewResolution,
frameState.devicePixelRatio, view2DState.projection);
frameState.pixelRatio, view2DState.projection);
if (!goog.isNull(image_)) {
var imageState = image_.getState();
if (imageState == ol.ImageState.IDLE) {

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

@@ -118,7 +118,7 @@ ol.renderer.webgl.ImageLayer.prototype.prepareFrame =
if (!hints[ol.ViewHint.ANIMATING] && !hints[ol.ViewHint.INTERACTING]) {
var image_ = imageSource.getImage(frameState.extent, viewResolution,
frameState.devicePixelRatio, view2DState.projection);
frameState.pixelRatio, view2DState.projection);
if (!goog.isNull(image_)) {
var imageState = image_.getState();
if (imageState == ol.ImageState.IDLE) {

3
src/ol/renderer/webgl/webgllayerrenderer.js
View File

@@ -238,8 +238,7 @@ ol.renderer.webgl.Layer.prototype.dispatchComposeEvent_ =
function(type, context, frameState) {
var layer = this.getLayer();
if (layer.hasListener(type)) {
var render = new ol.render.webgl.Immediate(context,
frameState.devicePixelRatio);
var render = new ol.render.webgl.Immediate(context, frameState.pixelRatio);
var composeEvent = new ol.render.Event(
type, layer, render, frameState, null, context);
layer.dispatchEvent(composeEvent);

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

@@ -285,8 +285,7 @@ ol.renderer.webgl.Map.prototype.dispatchComposeEvent_ =
var map = this.getMap();
if (map.hasListener(type)) {
var context = this.getContext();
var render = new ol.render.webgl.Immediate(context,
frameState.devicePixelRatio);
var render = new ol.render.webgl.Immediate(context, frameState.pixelRatio);
var composeEvent = new ol.render.Event(
type, map, render, frameState, null, context);
map.dispatchEvent(composeEvent);