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

Use blocked scoped variables

Browse Source 
In addition to using const and let, this also upgrades our linter config and removes lint (mostly whitespace).
This commit is contained in:
Tim Schaub
2018-01-11 23:32:36 -07:00
parent 0bf2b04dee
commit ad62739a6e
684 changed files with 18120 additions and 18184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
src/ol/extent.js
View File

@@ -14,8 +14,8 @@ import Relationship from './extent/Relationship.js';
* @api
*/
export function boundingExtent(coordinates) {
var extent = createEmpty();
for (var i = 0, ii = coordinates.length; i < ii; ++i) {
const extent = createEmpty();
for (let i = 0, ii = coordinates.length; i < ii; ++i) {
extendCoordinate(extent, coordinates[i]);
}
return extent;
@@ -30,10 +30,10 @@ export function boundingExtent(coordinates) {
* @return {ol.Extent} Extent.
*/
function _boundingExtentXYs(xs, ys, opt_extent) {
var minX = Math.min.apply(null, xs);
var minY = Math.min.apply(null, ys);
var maxX = Math.max.apply(null, xs);
var maxY = Math.max.apply(null, ys);
const minX = Math.min.apply(null, xs);
const minY = Math.min.apply(null, ys);
const maxX = Math.max.apply(null, xs);
const maxY = Math.max.apply(null, ys);
return createOrUpdate(minX, minY, maxX, maxY, opt_extent);
}
@@ -91,7 +91,7 @@ export function clone(extent, opt_extent) {
* @return {number} Closest squared distance.
*/
export function closestSquaredDistanceXY(extent, x, y) {
var dx, dy;
let dx, dy;
if (x < extent[0]) {
dx = extent[0] - x;
} else if (extent[2] < x) {
@@ -163,13 +163,13 @@ export function containsXY(extent, x, y) {
* ol.extent.Relationship).
*/
export function coordinateRelationship(extent, coordinate) {
var minX = extent[0];
var minY = extent[1];
var maxX = extent[2];
var maxY = extent[3];
var x = coordinate[0];
var y = coordinate[1];
var relationship = Relationship.UNKNOWN;
const minX = extent[0];
const minY = extent[1];
const maxX = extent[2];
const maxY = extent[3];
const x = coordinate[0];
const y = coordinate[1];
let relationship = Relationship.UNKNOWN;
if (x < minX) {
relationship = relationship | Relationship.LEFT;
} else if (x > maxX) {
@@ -226,7 +226,7 @@ export function createOrUpdate(minX, minY, maxX, maxY, opt_extent) {
*/
export function createOrUpdateEmpty(opt_extent) {
return createOrUpdate(
Infinity, Infinity, -Infinity, -Infinity, opt_extent);
Infinity, Infinity, -Infinity, -Infinity, opt_extent);
}
@@ -236,8 +236,8 @@ export function createOrUpdateEmpty(opt_extent) {
* @return {ol.Extent} Extent.
*/
export function createOrUpdateFromCoordinate(coordinate, opt_extent) {
var x = coordinate[0];
var y = coordinate[1];
const x = coordinate[0];
const y = coordinate[1];
return createOrUpdate(x, y, x, y, opt_extent);
}
@@ -248,7 +248,7 @@ export function createOrUpdateFromCoordinate(coordinate, opt_extent) {
* @return {ol.Extent} Extent.
*/
export function createOrUpdateFromCoordinates(coordinates, opt_extent) {
var extent = createOrUpdateEmpty(opt_extent);
const extent = createOrUpdateEmpty(opt_extent);
return extendCoordinates(extent, coordinates);
}
@@ -262,7 +262,7 @@ export function createOrUpdateFromCoordinates(coordinates, opt_extent) {
* @return {ol.Extent} Extent.
*/
export function createOrUpdateFromFlatCoordinates(flatCoordinates, offset, end, stride, opt_extent) {
var extent = createOrUpdateEmpty(opt_extent);
const extent = createOrUpdateEmpty(opt_extent);
return extendFlatCoordinates(extent, flatCoordinates, offset, end, stride);
}
@@ -272,7 +272,7 @@ export function createOrUpdateFromFlatCoordinates(flatCoordinates, offset, end,
* @return {ol.Extent} Extent.
*/
export function createOrUpdateFromRings(rings, opt_extent) {
var extent = createOrUpdateEmpty(opt_extent);
const extent = createOrUpdateEmpty(opt_extent);
return extendRings(extent, rings);
}
@@ -340,7 +340,7 @@ export function extendCoordinate(extent, coordinate) {
* @return {ol.Extent} Extent.
*/
export function extendCoordinates(extent, coordinates) {
var i, ii;
let i, ii;
for (i = 0, ii = coordinates.length; i < ii; ++i) {
extendCoordinate(extent, coordinates[i]);
}
@@ -370,7 +370,7 @@ export function extendFlatCoordinates(extent, flatCoordinates, offset, end, stri
* @return {ol.Extent} Extent.
*/
export function extendRings(extent, rings) {
var i, ii;
let i, ii;
for (i = 0, ii = rings.length; i < ii; ++i) {
extendCoordinates(extent, rings[i]);
}
@@ -402,7 +402,7 @@ export function extendXY(extent, x, y) {
* @template S, T
*/
export function forEachCorner(extent, callback, opt_this) {
var val;
let val;
val = callback.call(opt_this, getBottomLeft(extent));
if (val) {
return val;
@@ -430,7 +430,7 @@ export function forEachCorner(extent, callback, opt_this) {
* @api
*/
export function getArea(extent) {
var area = 0;
let area = 0;
if (!isEmpty(extent)) {
area = getWidth(extent) * getHeight(extent);
}
@@ -478,7 +478,7 @@ export function getCenter(extent) {
* @return {ol.Coordinate} Corner coordinate.
*/
export function getCorner(extent, corner) {
var coordinate;
let coordinate;
if (corner === Corner.BOTTOM_LEFT) {
coordinate = getBottomLeft(extent);
} else if (corner === Corner.BOTTOM_RIGHT) {
@@ -500,10 +500,10 @@ export function getCorner(extent, corner) {
* @return {number} Enlarged area.
*/
export function getEnlargedArea(extent1, extent2) {
var minX = Math.min(extent1[0], extent2[0]);
var minY = Math.min(extent1[1], extent2[1]);
var maxX = Math.max(extent1[2], extent2[2]);
var maxY = Math.max(extent1[3], extent2[3]);
const minX = Math.min(extent1[0], extent2[0]);
const minY = Math.min(extent1[1], extent2[1]);
const maxX = Math.max(extent1[2], extent2[2]);
const maxY = Math.max(extent1[3], extent2[3]);
return (maxX - minX) * (maxY - minY);
}
@@ -517,28 +517,28 @@ export function getEnlargedArea(extent1, extent2) {
* @return {ol.Extent} Extent.
*/
export function getForViewAndSize(center, resolution, rotation, size, opt_extent) {
var dx = resolution * size[0] / 2;
var dy = resolution * size[1] / 2;
var cosRotation = Math.cos(rotation);
var sinRotation = Math.sin(rotation);
var xCos = dx * cosRotation;
var xSin = dx * sinRotation;
var yCos = dy * cosRotation;
var ySin = dy * sinRotation;
var x = center[0];
var y = center[1];
var x0 = x - xCos + ySin;
var x1 = x - xCos - ySin;
var x2 = x + xCos - ySin;
var x3 = x + xCos + ySin;
var y0 = y - xSin - yCos;
var y1 = y - xSin + yCos;
var y2 = y + xSin + yCos;
var y3 = y + xSin - yCos;
const dx = resolution * size[0] / 2;
const dy = resolution * size[1] / 2;
const cosRotation = Math.cos(rotation);
const sinRotation = Math.sin(rotation);
const xCos = dx * cosRotation;
const xSin = dx * sinRotation;
const yCos = dy * cosRotation;
const ySin = dy * sinRotation;
const x = center[0];
const y = center[1];
const x0 = x - xCos + ySin;
const x1 = x - xCos - ySin;
const x2 = x + xCos - ySin;
const x3 = x + xCos + ySin;
const y0 = y - xSin - yCos;
const y1 = y - xSin + yCos;
const y2 = y + xSin + yCos;
const y3 = y + xSin - yCos;
return createOrUpdate(
Math.min(x0, x1, x2, x3), Math.min(y0, y1, y2, y3),
Math.max(x0, x1, x2, x3), Math.max(y0, y1, y2, y3),
opt_extent);
Math.min(x0, x1, x2, x3), Math.min(y0, y1, y2, y3),
Math.max(x0, x1, x2, x3), Math.max(y0, y1, y2, y3),
opt_extent);
}
@@ -559,7 +559,7 @@ export function getHeight(extent) {
* @return {number} Intersection area.
*/
export function getIntersectionArea(extent1, extent2) {
var intersection = getIntersection(extent1, extent2);
const intersection = getIntersection(extent1, extent2);
return getArea(intersection);
}
@@ -573,7 +573,7 @@ export function getIntersectionArea(extent1, extent2) {
* @api
*/
export function getIntersection(extent1, extent2, opt_extent) {
var intersection = opt_extent ? opt_extent : createEmpty();
const intersection = opt_extent ? opt_extent : createEmpty();
if (intersects(extent1, extent2)) {
if (extent1[0] > extent2[0]) {
intersection[0] = extent1[0];
@@ -702,8 +702,8 @@ export function returnOrUpdate(extent, opt_extent) {
* @param {number} value Value.
*/
export function scaleFromCenter(extent, value) {
var deltaX = ((extent[2] - extent[0]) / 2) * (value - 1);
var deltaY = ((extent[3] - extent[1]) / 2) * (value - 1);
const deltaX = ((extent[2] - extent[0]) / 2) * (value - 1);
const deltaY = ((extent[3] - extent[1]) / 2) * (value - 1);
extent[0] -= deltaX;
extent[2] += deltaX;
extent[1] -= deltaY;
@@ -720,23 +720,23 @@ export function scaleFromCenter(extent, value) {
* @return {boolean} The segment intersects the extent.
*/
export function intersectsSegment(extent, start, end) {
var intersects = false;
var startRel = coordinateRelationship(extent, start);
var endRel = coordinateRelationship(extent, end);
let intersects = false;
const startRel = coordinateRelationship(extent, start);
const endRel = coordinateRelationship(extent, end);
if (startRel === Relationship.INTERSECTING ||
endRel === Relationship.INTERSECTING) {
intersects = true;
} else {
var minX = extent[0];
var minY = extent[1];
var maxX = extent[2];
var maxY = extent[3];
var startX = start[0];
var startY = start[1];
var endX = end[0];
var endY = end[1];
var slope = (endY - startY) / (endX - startX);
var x, y;
const minX = extent[0];
const minY = extent[1];
const maxX = extent[2];
const maxY = extent[3];
const startX = start[0];
const startY = start[1];
const endX = end[0];
const endY = end[1];
const slope = (endY - startY) / (endX - startX);
let x, y;
if (!!(endRel & Relationship.ABOVE) &&
!(startRel & Relationship.ABOVE)) {
// potentially intersects top
@@ -777,14 +777,14 @@ export function intersectsSegment(extent, start, end) {
* @api
*/
export function applyTransform(extent, transformFn, opt_extent) {
var coordinates = [
const coordinates = [
extent[0], extent[1],
extent[0], extent[3],
extent[2], extent[1],
extent[2], extent[3]
];
transformFn(coordinates, coordinates, 2);
var xs = [coordinates[0], coordinates[2], coordinates[4], coordinates[6]];
var ys = [coordinates[1], coordinates[3], coordinates[5], coordinates[7]];
const xs = [coordinates[0], coordinates[2], coordinates[4], coordinates[6]];
const ys = [coordinates[1], coordinates[3], coordinates[5], coordinates[7]];
return _boundingExtentXYs(xs, ys, opt_extent);
}