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

Fix type name for module:ol/extent/Corner~Corner and Relationship

Browse Source
This commit is contained in:
Frederic Junod
2018-03-15 14:39:54 +01:00
parent 7d727d287c
commit f7944d3762
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ol/extent.js
View File

@@ -165,8 +165,8 @@ export function containsXY(extent, x, y) {
* Get the relationship between a coordinate and extent. * Get the relationship between a coordinate and extent.
* @param {module:ol/extent~Extent} extent The extent. * @param {module:ol/extent~Extent} extent The extent.
* @param {module:ol/coordinate~Coordinate} coordinate The coordinate. * @param {module:ol/coordinate~Coordinate} coordinate The coordinate.
* @return {number} The relationship (bitwise compare with * @return {module:ol/extent/Relationship~Relationship} The relationship (bitwise compare with
* module:ol/extent~Extent.Relationship). * module:ol/extent/Relationship~Relationship).
*/ */
export function coordinateRelationship(extent, coordinate) { export function coordinateRelationship(extent, coordinate) {
const minX = extent[0]; const minX = extent[0];
@@ -478,7 +478,7 @@ export function getCenter(extent) {
/** /**
* Get a corner coordinate of an extent. * Get a corner coordinate of an extent.
* @param {module:ol/extent~Extent} extent 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. * @return {module:ol/coordinate~Coordinate} Corner coordinate.
*/ */
export function getCorner(extent, corner) { export function getCorner(extent, corner) {

15
src/ol/tilegrid.js
View File

@@ -53,15 +53,13 @@ export function wrapX(tileGrid, tileCoord, projection) {
* DEFAULT_MAX_ZOOM). * DEFAULT_MAX_ZOOM).
* @param {number|module:ol/size~Size=} opt_tileSize Tile size (default uses * @param {number|module:ol/size~Size=} opt_tileSize Tile size (default uses
* DEFAULT_TILE_SIZE). * DEFAULT_TILE_SIZE).
* @param {module:ol/extent~Extent.Corner=} opt_corner Extent corner (default is * @param {module:ol/extent/Corner~Corner=} opt_corner Extent corner (default is `'top-left'`).
* module:ol/extent~Extent.Corner.TOP_LEFT).
* @return {!module:ol/tilegrid/TileGrid~TileGrid} TileGrid instance. * @return {!module:ol/tilegrid/TileGrid~TileGrid} TileGrid instance.
*/ */
export function createForExtent(extent, opt_maxZoom, opt_tileSize, opt_corner) { export function createForExtent(extent, opt_maxZoom, opt_tileSize, opt_corner) {
const corner = opt_corner !== undefined ? opt_corner : Corner.TOP_LEFT; const corner = opt_corner !== undefined ? opt_corner : Corner.TOP_LEFT;
const resolutions = resolutionsFromExtent( const resolutions = resolutionsFromExtent(extent, opt_maxZoom, opt_tileSize);
extent, opt_maxZoom, opt_tileSize);
return new TileGrid({ return new TileGrid({
extent: extent, extent: extent,
@@ -129,14 +127,12 @@ function resolutionsFromExtent(extent, opt_maxZoom, opt_tileSize) {
* DEFAULT_MAX_ZOOM). * DEFAULT_MAX_ZOOM).
* @param {number|module:ol/size~Size=} opt_tileSize Tile size (default uses * @param {number|module:ol/size~Size=} opt_tileSize Tile size (default uses
* DEFAULT_TILE_SIZE). * DEFAULT_TILE_SIZE).
* @param {module:ol/extent~Extent.Corner=} opt_corner Extent corner (default is * @param {module:ol/extent/Corner~Corner=} opt_corner Extent corner (default is `'top-left'`).
* module:ol/extent~Extent.Corner.BOTTOM_LEFT).
* @return {!module:ol/tilegrid/TileGrid~TileGrid} TileGrid instance. * @return {!module:ol/tilegrid/TileGrid~TileGrid} TileGrid instance.
*/ */
export function createForProjection(projection, opt_maxZoom, opt_tileSize, opt_corner) { export function createForProjection(projection, opt_maxZoom, opt_tileSize, opt_corner) {
const extent = extentFromProjection(projection); const extent = extentFromProjection(projection);
return createForExtent( return createForExtent(extent, opt_maxZoom, opt_tileSize, opt_corner);
extent, opt_maxZoom, opt_tileSize, opt_corner);
} }
@@ -150,8 +146,7 @@ export function extentFromProjection(projection) {
projection = getProjection(projection); projection = getProjection(projection);
let extent = projection.getExtent(); let extent = projection.getExtent();
if (!extent) { if (!extent) {
const half = 180 * METERS_PER_UNIT[Units.DEGREES] / const half = 180 * METERS_PER_UNIT[Units.DEGREES] / projection.getMetersPerUnit();
projection.getMetersPerUnit();
extent = createOrUpdate(-half, -half, half, half); extent = createOrUpdate(-half, -half, half, half);
} }
return extent; return extent;