From f7944d376255ef180c47bf4ea51b6d30eef32bde Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Thu, 15 Mar 2018 14:39:54 +0100 Subject: [PATCH] Fix type name for module:ol/extent/Corner~Corner and Relationship --- src/ol/extent.js | 6 +++--- src/ol/tilegrid.js | 15 +++++---------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/ol/extent.js b/src/ol/extent.js index 0a6c5c2fbd..8b3ac8fc23 100644 --- a/src/ol/extent.js +++ b/src/ol/extent.js @@ -165,8 +165,8 @@ export function containsXY(extent, x, y) { * Get the relationship between a coordinate and extent. * @param {module:ol/extent~Extent} extent The extent. * @param {module:ol/coordinate~Coordinate} coordinate The coordinate. - * @return {number} The relationship (bitwise compare with - * module:ol/extent~Extent.Relationship). + * @return {module:ol/extent/Relationship~Relationship} The relationship (bitwise compare with + * module:ol/extent/Relationship~Relationship). */ export function coordinateRelationship(extent, coordinate) { const minX = extent[0]; @@ -478,7 +478,7 @@ export function getCenter(extent) { /** * Get a corner coordinate of an extent. * @param {module:ol/extent~Extent} extent Extent. - * @param {module:ol/extent~Extent.Corner} corner Corner. + * @param {module:ol/extent/Corner~Corner} corner Corner. * @return {module:ol/coordinate~Coordinate} Corner coordinate. */ export function getCorner(extent, corner) { diff --git a/src/ol/tilegrid.js b/src/ol/tilegrid.js index 113c6b1ff8..18875e8e6a 100644 --- a/src/ol/tilegrid.js +++ b/src/ol/tilegrid.js @@ -53,15 +53,13 @@ export function wrapX(tileGrid, tileCoord, projection) { * DEFAULT_MAX_ZOOM). * @param {number|module:ol/size~Size=} opt_tileSize Tile size (default uses * DEFAULT_TILE_SIZE). - * @param {module:ol/extent~Extent.Corner=} opt_corner Extent corner (default is - * module:ol/extent~Extent.Corner.TOP_LEFT). + * @param {module:ol/extent/Corner~Corner=} opt_corner Extent corner (default is `'top-left'`). * @return {!module:ol/tilegrid/TileGrid~TileGrid} TileGrid instance. */ export function createForExtent(extent, opt_maxZoom, opt_tileSize, opt_corner) { const corner = opt_corner !== undefined ? opt_corner : Corner.TOP_LEFT; - const resolutions = resolutionsFromExtent( - extent, opt_maxZoom, opt_tileSize); + const resolutions = resolutionsFromExtent(extent, opt_maxZoom, opt_tileSize); return new TileGrid({ extent: extent, @@ -129,14 +127,12 @@ function resolutionsFromExtent(extent, opt_maxZoom, opt_tileSize) { * DEFAULT_MAX_ZOOM). * @param {number|module:ol/size~Size=} opt_tileSize Tile size (default uses * DEFAULT_TILE_SIZE). - * @param {module:ol/extent~Extent.Corner=} opt_corner Extent corner (default is - * module:ol/extent~Extent.Corner.BOTTOM_LEFT). + * @param {module:ol/extent/Corner~Corner=} opt_corner Extent corner (default is `'top-left'`). * @return {!module:ol/tilegrid/TileGrid~TileGrid} TileGrid instance. */ export function createForProjection(projection, opt_maxZoom, opt_tileSize, opt_corner) { const extent = extentFromProjection(projection); - return createForExtent( - extent, opt_maxZoom, opt_tileSize, opt_corner); + return createForExtent(extent, opt_maxZoom, opt_tileSize, opt_corner); } @@ -150,8 +146,7 @@ export function extentFromProjection(projection) { projection = getProjection(projection); let extent = projection.getExtent(); if (!extent) { - const half = 180 * METERS_PER_UNIT[Units.DEGREES] / - projection.getMetersPerUnit(); + const half = 180 * METERS_PER_UNIT[Units.DEGREES] / projection.getMetersPerUnit(); extent = createOrUpdate(-half, -half, half, half); } return extent;