From 4667dec7c37d62da51ccaa2cb168310396ba0736 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 14 Jan 2014 15:30:49 +0100 Subject: [PATCH] Rename devicePixelRatio to pixelRatio in ol.FrameState --- src/objectliterals.jsdoc | 6 +++--- src/ol/framestate.js | 2 +- src/ol/map.js | 6 +++--- src/ol/renderer/canvas/canvasimagelayerrenderer.js | 12 ++++++------ src/ol/renderer/canvas/canvaslayerrenderer.js | 12 ++++++------ src/ol/renderer/canvas/canvasmaprenderer.js | 13 ++++++------- src/ol/renderer/canvas/canvastilelayerrenderer.js | 10 +++++----- src/ol/renderer/canvas/canvasvectorlayerrenderer.js | 4 ++-- src/ol/renderer/dom/domimagelayerrenderer.js | 2 +- src/ol/renderer/webgl/webglimagelayerrenderer.js | 2 +- src/ol/renderer/webgl/webgllayerrenderer.js | 3 +-- src/ol/renderer/webgl/webglmaprenderer.js | 3 +-- 12 files changed, 36 insertions(+), 39 deletions(-) diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc index 45f46d3fca..b52577d250 100644 --- a/src/objectliterals.jsdoc +++ b/src/objectliterals.jsdoc @@ -25,7 +25,7 @@ * @typedef {Object} olx.MapOptions * @property {ol.Collection|Array.|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.|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`. diff --git a/src/ol/framestate.js b/src/ol/framestate.js index 01db517e0d..23bfee5234 100644 --- a/src/ol/framestate.js +++ b/src/ol/framestate.js @@ -20,13 +20,13 @@ goog.require('ol.layer.LayerState'); * @typedef {{animate: boolean, * attributions: Object., * coordinateToPixelMatrix: goog.vec.Mat4.Number, - * devicePixelRatio: number, * extent: (null|ol.Extent), * focus: ol.Coordinate, * index: number, * layersArray: Array., * layerStates: Object., * logos: Object., + * pixelRatio: number, * pixelToCoordinateMatrix: goog.vec.Mat4.Number, * postRenderFunctions: Array., * size: ol.Size, diff --git a/src/ol/map.js b/src/ol/map.js index d7b3a4e048..fdde46f9b4 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -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, diff --git a/src/ol/renderer/canvas/canvasimagelayerrenderer.js b/src/ol/renderer/canvas/canvasimagelayerrenderer.js index 7f17c14ee3..a108112034 100644 --- a/src/ol/renderer/canvas/canvasimagelayerrenderer.js +++ b/src/ol/renderer/canvas/canvasimagelayerrenderer.js @@ -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, diff --git a/src/ol/renderer/canvas/canvaslayerrenderer.js b/src/ol/renderer/canvas/canvaslayerrenderer.js index 83f14bda4c..e2a9ae7949 100644 --- a/src/ol/renderer/canvas/canvaslayerrenderer.js +++ b/src/ol/renderer/canvas/canvaslayerrenderer.js @@ -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]); }; diff --git a/src/ol/renderer/canvas/canvasmaprenderer.js b/src/ol/renderer/canvas/canvasmaprenderer.js index 1b61817f00..d4d4dc2404 100644 --- a/src/ol/renderer/canvas/canvasmaprenderer.js +++ b/src/ol/renderer/canvas/canvasmaprenderer.js @@ -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; diff --git a/src/ol/renderer/canvas/canvastilelayerrenderer.js b/src/ol/renderer/canvas/canvastilelayerrenderer.js index c24e597615..b6367dfe94 100644 --- a/src/ol/renderer/canvas/canvastilelayerrenderer.js +++ b/src/ol/renderer/canvas/canvastilelayerrenderer.js @@ -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); diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js index d1c973e293..4247864b11 100644 --- a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js +++ b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js @@ -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 && diff --git a/src/ol/renderer/dom/domimagelayerrenderer.js b/src/ol/renderer/dom/domimagelayerrenderer.js index 62637b0548..2578a0e682 100644 --- a/src/ol/renderer/dom/domimagelayerrenderer.js +++ b/src/ol/renderer/dom/domimagelayerrenderer.js @@ -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) { diff --git a/src/ol/renderer/webgl/webglimagelayerrenderer.js b/src/ol/renderer/webgl/webglimagelayerrenderer.js index 466fa0f8ed..2fd5c166fd 100644 --- a/src/ol/renderer/webgl/webglimagelayerrenderer.js +++ b/src/ol/renderer/webgl/webglimagelayerrenderer.js @@ -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) { diff --git a/src/ol/renderer/webgl/webgllayerrenderer.js b/src/ol/renderer/webgl/webgllayerrenderer.js index 3c78897a3a..34d2cf8a7d 100644 --- a/src/ol/renderer/webgl/webgllayerrenderer.js +++ b/src/ol/renderer/webgl/webgllayerrenderer.js @@ -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); diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js index 494551bbd6..66e87932fe 100644 --- a/src/ol/renderer/webgl/webglmaprenderer.js +++ b/src/ol/renderer/webgl/webglmaprenderer.js @@ -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);