From 1cc49e0b23159f942f7aa0121a1e64193206669f Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 17 Nov 2018 14:49:29 +0100 Subject: [PATCH] Clearer function name for getting a render pixel --- examples/magnify.js | 6 +++--- src/ol/render.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/magnify.js b/examples/magnify.js index 9193b2f1d2..f3822688ec 100644 --- a/examples/magnify.js +++ b/examples/magnify.js @@ -3,7 +3,7 @@ import View from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import {fromLonLat} from '../src/ol/proj.js'; import BingMaps from '../src/ol/source/BingMaps.js'; -import {getPixelFromPixel} from '../src/ol/render.js'; +import {getRenderPixel} from '../src/ol/render.js'; const key = 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5'; @@ -51,8 +51,8 @@ container.addEventListener('mouseout', function() { // after rendering the layer, show an oversampled version around the pointer imagery.on('postrender', function(event) { if (mousePosition) { - const pixel = getPixelFromPixel(event, mousePosition); - const offset = getPixelFromPixel(event, [mousePosition[0] + radius, mousePosition[1]]); + const pixel = getRenderPixel(event, mousePosition); + const offset = getRenderPixel(event, [mousePosition[0] + radius, mousePosition[1]]); const half = Math.sqrt(Math.pow(offset[0] - pixel[0], 2) + Math.pow(offset[1] - pixel[1], 2)); const context = event.context; const centerX = pixel[0]; diff --git a/src/ol/render.js b/src/ol/render.js index ec8d3be91c..f0e92541ca 100644 --- a/src/ol/render.js +++ b/src/ol/render.js @@ -99,14 +99,14 @@ export function getVectorContext(event) { } /** - * Gets the pixel of the event's canvas context from the map viewport's css pixel + * Gets the pixel of the event's canvas context from the map viewport's CSS pixel. * @param {import("./render/Event.js").default} event Render event. - * @param {import("./pixel.js").Pixel} pixel Css pixel relative to the top-left + * @param {import("./pixel.js").Pixel} pixel CSS pixel relative to the top-left * corner of the map viewport. * @returns {import("./pixel.js").Pixel} Pixel on the event's canvas context. * @api */ -export function getPixelFromPixel(event, pixel) { +export function getRenderPixel(event, pixel) { const result = pixel.slice(0); applyTransform(event.inversePixelTransform.slice(), result); return result;