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

Better variables scoping

Browse Source
This commit is contained in:
Frederic Junod
2018-01-17 16:07:36 +01:00
parent 4a6331377f
commit 039d4dc714
22 changed files with 74 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ol/geom/MultiPoint.js
View File

@@ -67,13 +67,12 @@ MultiPoint.prototype.closestPointXY = function(x, y, closestPoint, minSquaredDis
}
const flatCoordinates = this.flatCoordinates;
const stride = this.stride;
let i, ii, j;
for (i = 0, ii = flatCoordinates.length; i < ii; i += stride) {
for (let i = 0, ii = flatCoordinates.length; i < ii; i += stride) {
const squaredDistance = squaredDx(
x, y, flatCoordinates[i], flatCoordinates[i + 1]);
if (squaredDistance < minSquaredDistance) {
minSquaredDistance = squaredDistance;
for (j = 0; j < stride; ++j) {
for (let j = 0; j < stride; ++j) {
closestPoint[j] = flatCoordinates[i + j];
}
closestPoint.length = stride;
@@ -102,8 +101,7 @@ MultiPoint.prototype.getCoordinates = function() {
* @api
*/
MultiPoint.prototype.getPoint = function(index) {
const n = !this.flatCoordinates ?
0 : this.flatCoordinates.length / this.stride;
const n = !this.flatCoordinates ? 0 : this.flatCoordinates.length / this.stride;
if (index < 0 || n <= index) {
return null;
}
@@ -125,8 +123,7 @@ MultiPoint.prototype.getPoints = function() {
const stride = this.stride;
/** @type {Array.<ol.geom.Point>} */
const points = [];
let i, ii;
for (i = 0, ii = flatCoordinates.length; i < ii; i += stride) {
for (let i = 0, ii = flatCoordinates.length; i < ii; i += stride) {
const point = new Point(null);
point.setFlatCoordinates(layout, flatCoordinates.slice(i, i + stride));
points.push(point);
@@ -151,10 +148,9 @@ MultiPoint.prototype.getType = function() {
MultiPoint.prototype.intersectsExtent = function(extent) {
const flatCoordinates = this.flatCoordinates;
const stride = this.stride;
let i, ii, x, y;
for (i = 0, ii = flatCoordinates.length; i < ii; i += stride) {
x = flatCoordinates[i];
y = flatCoordinates[i + 1];
for (let i = 0, ii = flatCoordinates.length; i < ii; i += stride) {
const x = flatCoordinates[i];
const y = flatCoordinates[i + 1];
if (containsXY(extent, x, y)) {
return true;
}