Better variables scoping

src/ol/geom/flat/center.js

@@ -14,9 +14,8 @@ const _ol_geom_flat_center_ = {};
  */
 _ol_geom_flat_center_.linearRingss = function(flatCoordinates, offset, endss, stride) {
   const flatCenters = [];
-  let i, ii;
   let extent = createEmpty();
-  for (i = 0, ii = endss.length; i < ii; ++i) {
+  for (let i = 0, ii = endss.length; i < ii; ++i) {
     const ends = endss[i];
     extent = createOrUpdateFromFlatCoordinates(flatCoordinates, offset, ends[0], stride);
     flatCenters.push((extent[0] + extent[2]) / 2, (extent[1] + extent[3]) / 2);

src/ol/geom/flat/closest.js

@@ -22,7 +22,7 @@ _ol_geom_flat_closest_.point = function(flatCoordinates, offset1, offset2, strid
   const y1 = flatCoordinates[offset1 + 1];
   const dx = flatCoordinates[offset2] - x1;
   const dy = flatCoordinates[offset2 + 1] - y1;
-  let i, offset;
+  let offset;
   if (dx === 0 && dy === 0) {
     offset = offset1;
   } else {
@@ -30,7 +30,7 @@ _ol_geom_flat_closest_.point = function(flatCoordinates, offset1, offset2, strid
     if (t > 1) {
       offset = offset2;
     } else if (t > 0) {
-      for (i = 0; i < stride; ++i) {
+      for (let i = 0; i < stride; ++i) {
         closestPoint[i] = lerp(flatCoordinates[offset1 + i],
           flatCoordinates[offset2 + i], t);
       }
@@ -40,7 +40,7 @@ _ol_geom_flat_closest_.point = function(flatCoordinates, offset1, offset2, strid
       offset = offset1;
     }
   }
-  for (i = 0; i < stride; ++i) {
+  for (let i = 0; i < stride; ++i) {
     closestPoint[i] = flatCoordinates[offset + i];
   }
   closestPoint.length = stride;
@@ -83,8 +83,7 @@ _ol_geom_flat_closest_.getMaxSquaredDelta = function(flatCoordinates, offset, en
  * @return {number} Max squared delta.
  */
 _ol_geom_flat_closest_.getsMaxSquaredDelta = function(flatCoordinates, offset, ends, stride, maxSquaredDelta) {
-  let i, ii;
-  for (i = 0, ii = ends.length; i < ii; ++i) {
+  for (let i = 0, ii = ends.length; i < ii; ++i) {
     const end = ends[i];
     maxSquaredDelta = _ol_geom_flat_closest_.getMaxSquaredDelta(
       flatCoordinates, offset, end, stride, maxSquaredDelta);
@@ -103,8 +102,7 @@ _ol_geom_flat_closest_.getsMaxSquaredDelta = function(flatCoordinates, offset, e
  * @return {number} Max squared delta.
  */
 _ol_geom_flat_closest_.getssMaxSquaredDelta = function(flatCoordinates, offset, endss, stride, maxSquaredDelta) {
-  let i, ii;
-  for (i = 0, ii = endss.length; i < ii; ++i) {
+  for (let i = 0, ii = endss.length; i < ii; ++i) {
     const ends = endss[i];
     maxSquaredDelta = _ol_geom_flat_closest_.getsMaxSquaredDelta(
       flatCoordinates, offset, ends, stride, maxSquaredDelta);
@@ -213,8 +211,7 @@ _ol_geom_flat_closest_.getsClosestPoint = function(flatCoordinates, offset, ends
   stride, maxDelta, isRing, x, y, closestPoint, minSquaredDistance,
   opt_tmpPoint) {
   const tmpPoint = opt_tmpPoint ? opt_tmpPoint : [NaN, NaN];
-  let i, ii;
-  for (i = 0, ii = ends.length; i < ii; ++i) {
+  for (let i = 0, ii = ends.length; i < ii; ++i) {
     const end = ends[i];
     minSquaredDistance = _ol_geom_flat_closest_.getClosestPoint(
       flatCoordinates, offset, end, stride,
@@ -243,8 +240,7 @@ _ol_geom_flat_closest_.getssClosestPoint = function(flatCoordinates, offset,
   endss, stride, maxDelta, isRing, x, y, closestPoint, minSquaredDistance,
   opt_tmpPoint) {
   const tmpPoint = opt_tmpPoint ? opt_tmpPoint : [NaN, NaN];
-  let i, ii;
-  for (i = 0, ii = endss.length; i < ii; ++i) {
+  for (let i = 0, ii = endss.length; i < ii; ++i) {
     const ends = endss[i];
     minSquaredDistance = _ol_geom_flat_closest_.getsClosestPoint(
       flatCoordinates, offset, ends, stride,

src/ol/geom/flat/contains.js

@@ -81,8 +81,7 @@ _ol_geom_flat_contains_.linearRingsContainsXY = function(flatCoordinates, offset
     flatCoordinates, offset, ends[0], stride, x, y)) {
     return false;
   }
-  let i, ii;
-  for (i = 1, ii = ends.length; i < ii; ++i) {
+  for (let i = 1, ii = ends.length; i < ii; ++i) {
     if (_ol_geom_flat_contains_.linearRingContainsXY(
       flatCoordinates, ends[i - 1], ends[i], stride, x, y)) {
       return false;
@@ -105,8 +104,7 @@ _ol_geom_flat_contains_.linearRingssContainsXY = function(flatCoordinates, offse
   if (endss.length === 0) {
     return false;
   }
-  let i, ii;
-  for (i = 0, ii = endss.length; i < ii; ++i) {
+  for (let i = 0, ii = endss.length; i < ii; ++i) {
     const ends = endss[i];
     if (_ol_geom_flat_contains_.linearRingsContainsXY(
       flatCoordinates, offset, ends, stride, x, y)) {

src/ol/geom/flat/deflate.js

@@ -12,8 +12,7 @@ const _ol_geom_flat_deflate_ = {};
  * @return {number} offset Offset.
  */
 _ol_geom_flat_deflate_.coordinate = function(flatCoordinates, offset, coordinate, stride) {
-  let i, ii;
-  for (i = 0, ii = coordinate.length; i < ii; ++i) {
+  for (let i = 0, ii = coordinate.length; i < ii; ++i) {
     flatCoordinates[offset++] = coordinate[i];
   }
   return offset;
@@ -28,8 +27,7 @@ _ol_geom_flat_deflate_.coordinate = function(flatCoordinates, offset, coordinate
  * @return {number} offset Offset.
  */
 _ol_geom_flat_deflate_.coordinates = function(flatCoordinates, offset, coordinates, stride) {
-  let i, ii;
-  for (i = 0, ii = coordinates.length; i < ii; ++i) {
+  for (let i = 0, ii = coordinates.length; i < ii; ++i) {
     const coordinate = coordinates[i];
     for (let j = 0; j < stride; ++j) {
       flatCoordinates[offset++] = coordinate[j];
@@ -50,8 +48,7 @@ _ol_geom_flat_deflate_.coordinates = function(flatCoordinates, offset, coordinat
 _ol_geom_flat_deflate_.coordinatess = function(flatCoordinates, offset, coordinatess, stride, opt_ends) {
   const ends = opt_ends ? opt_ends : [];
   let i = 0;
-  let j, jj;
-  for (j = 0, jj = coordinatess.length; j < jj; ++j) {
+  for (let j = 0, jj = coordinatess.length; j < jj; ++j) {
     const end = _ol_geom_flat_deflate_.coordinates(
       flatCoordinates, offset, coordinatess[j], stride);
     ends[i++] = end;
@@ -73,8 +70,7 @@ _ol_geom_flat_deflate_.coordinatess = function(flatCoordinates, offset, coordina
 _ol_geom_flat_deflate_.coordinatesss = function(flatCoordinates, offset, coordinatesss, stride, opt_endss) {
   const endss = opt_endss ? opt_endss : [];
   let i = 0;
-  let j, jj;
-  for (j = 0, jj = coordinatesss.length; j < jj; ++j) {
+  for (let j = 0, jj = coordinatesss.length; j < jj; ++j) {
     const ends = _ol_geom_flat_deflate_.coordinatess(
       flatCoordinates, offset, coordinatesss[j], stride, endss[i]);
     endss[i++] = ends;

src/ol/geom/flat/inflate.js

@@ -15,8 +15,7 @@ const _ol_geom_flat_inflate_ = {};
 _ol_geom_flat_inflate_.coordinates = function(flatCoordinates, offset, end, stride, opt_coordinates) {
   const coordinates = opt_coordinates !== undefined ? opt_coordinates : [];
   let i = 0;
-  let j;
-  for (j = offset; j < end; j += stride) {
+  for (let j = offset; j < end; j += stride) {
     coordinates[i++] = flatCoordinates.slice(j, j + stride);
   }
   coordinates.length = i;
@@ -35,8 +34,7 @@ _ol_geom_flat_inflate_.coordinates = function(flatCoordinates, offset, end, stri
 _ol_geom_flat_inflate_.coordinatess = function(flatCoordinates, offset, ends, stride, opt_coordinatess) {
   const coordinatess = opt_coordinatess !== undefined ? opt_coordinatess : [];
   let i = 0;
-  let j, jj;
-  for (j = 0, jj = ends.length; j < jj; ++j) {
+  for (let j = 0, jj = ends.length; j < jj; ++j) {
     const end = ends[j];
     coordinatess[i++] = _ol_geom_flat_inflate_.coordinates(
       flatCoordinates, offset, end, stride, coordinatess[i]);
@@ -59,8 +57,7 @@ _ol_geom_flat_inflate_.coordinatess = function(flatCoordinates, offset, ends, st
 _ol_geom_flat_inflate_.coordinatesss = function(flatCoordinates, offset, endss, stride, opt_coordinatesss) {
   const coordinatesss = opt_coordinatesss !== undefined ? opt_coordinatesss : [];
   let i = 0;
-  let j, jj;
-  for (j = 0, jj = endss.length; j < jj; ++j) {
+  for (let j = 0, jj = endss.length; j < jj; ++j) {
     const ends = endss[j];
     coordinatesss[i++] = _ol_geom_flat_inflate_.coordinatess(
       flatCoordinates, offset, ends, stride, coordinatesss[i]);

src/ol/geom/flat/interiorpoint.js

@@ -85,8 +85,7 @@ _ol_geom_flat_interiorpoint_.linearRings = function(flatCoordinates, offset,
  */
 _ol_geom_flat_interiorpoint_.linearRingss = function(flatCoordinates, offset, endss, stride, flatCenters) {
   let interiorPoints = [];
-  let i, ii;
-  for (i = 0, ii = endss.length; i < ii; ++i) {
+  for (let i = 0, ii = endss.length; i < ii; ++i) {
     const ends = endss[i];
     interiorPoints = _ol_geom_flat_interiorpoint_.linearRings(flatCoordinates,
       offset, ends, stride, flatCenters, 2 * i, interiorPoints);

src/ol/geom/flat/intersectsextent.js

@@ -54,8 +54,7 @@ _ol_geom_flat_intersectsextent_.lineString = function(flatCoordinates, offset, e
  * @return {boolean} True if the geometry and the extent intersect.
  */
 _ol_geom_flat_intersectsextent_.lineStrings = function(flatCoordinates, offset, ends, stride, extent) {
-  let i, ii;
-  for (i = 0, ii = ends.length; i < ii; ++i) {
+  for (let i = 0, ii = ends.length; i < ii; ++i) {
     if (_ol_geom_flat_intersectsextent_.lineString(
       flatCoordinates, offset, ends[i], stride, extent)) {
       return true;
@@ -115,8 +114,7 @@ _ol_geom_flat_intersectsextent_.linearRings = function(flatCoordinates, offset,
   if (ends.length === 1) {
     return true;
   }
-  let i, ii;
-  for (i = 1, ii = ends.length; i < ii; ++i) {
+  for (let i = 1, ii = ends.length; i < ii; ++i) {
     if (_ol_geom_flat_contains_.linearRingContainsExtent(
       flatCoordinates, ends[i - 1], ends[i], stride, extent)) {
       return false;
@@ -135,8 +133,7 @@ _ol_geom_flat_intersectsextent_.linearRings = function(flatCoordinates, offset,
  * @return {boolean} True if the geometry and the extent intersect.
  */
 _ol_geom_flat_intersectsextent_.linearRingss = function(flatCoordinates, offset, endss, stride, extent) {
-  let i, ii;
-  for (i = 0, ii = endss.length; i < ii; ++i) {
+  for (let i = 0, ii = endss.length; i < ii; ++i) {
     const ends = endss[i];
     if (_ol_geom_flat_intersectsextent_.linearRings(
       flatCoordinates, offset, ends, stride, extent)) {

src/ol/geom/flat/length.js

@@ -15,8 +15,7 @@ _ol_geom_flat_length_.lineString = function(flatCoordinates, offset, end, stride
   let x1 = flatCoordinates[offset];
   let y1 = flatCoordinates[offset + 1];
   let length = 0;
-  let i;
-  for (i = offset + stride; i < end; i += stride) {
+  for (let i = offset + stride; i < end; i += stride) {
     const x2 = flatCoordinates[i];
     const y2 = flatCoordinates[i + 1];
     length += Math.sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1));
@@ -35,8 +34,7 @@ _ol_geom_flat_length_.lineString = function(flatCoordinates, offset, end, stride
  * @return {number} Perimeter.
  */
 _ol_geom_flat_length_.linearRing = function(flatCoordinates, offset, end, stride) {
-  let perimeter =
-      _ol_geom_flat_length_.lineString(flatCoordinates, offset, end, stride);
+  let perimeter = _ol_geom_flat_length_.lineString(flatCoordinates, offset, end, stride);
   const dx = flatCoordinates[end - stride] - flatCoordinates[offset];
   const dy = flatCoordinates[end - stride + 1] - flatCoordinates[offset + 1];
   perimeter += Math.sqrt(dx * dx + dy * dy);

src/ol/geom/flat/simplify.js

@@ -91,7 +91,6 @@ _ol_geom_flat_simplify_.douglasPeucker = function(flatCoordinates, offset, end,
   /** @type {Array.<number>} */
   const stack = [offset, end - stride];
   let index = 0;
-  let i;
   while (stack.length > 0) {
     const last = stack.pop();
     const first = stack.pop();
@@ -100,7 +99,7 @@ _ol_geom_flat_simplify_.douglasPeucker = function(flatCoordinates, offset, end,
     const y1 = flatCoordinates[first + 1];
     const x2 = flatCoordinates[last];
     const y2 = flatCoordinates[last + 1];
-    for (i = first + stride; i < last; i += stride) {
+    for (let i = first + stride; i < last; i += stride) {
       const x = flatCoordinates[i];
       const y = flatCoordinates[i + 1];
       const squaredDistance = squaredSegmentDistance(
@@ -120,7 +119,7 @@ _ol_geom_flat_simplify_.douglasPeucker = function(flatCoordinates, offset, end,
       }
     }
   }
-  for (i = 0; i < n; ++i) {
+  for (let i = 0; i < n; ++i) {
     if (markers[i]) {
       simplifiedFlatCoordinates[simplifiedOffset++] =
           flatCoordinates[offset + i * stride];
@@ -147,8 +146,7 @@ _ol_geom_flat_simplify_.douglasPeucker = function(flatCoordinates, offset, end,
 _ol_geom_flat_simplify_.douglasPeuckers = function(flatCoordinates, offset,
   ends, stride, squaredTolerance, simplifiedFlatCoordinates,
   simplifiedOffset, simplifiedEnds) {
-  let i, ii;
-  for (i = 0, ii = ends.length; i < ii; ++i) {
+  for (let i = 0, ii = ends.length; i < ii; ++i) {
     const end = ends[i];
     simplifiedOffset = _ol_geom_flat_simplify_.douglasPeucker(
       flatCoordinates, offset, end, stride, squaredTolerance,
@@ -175,8 +173,7 @@ _ol_geom_flat_simplify_.douglasPeuckers = function(flatCoordinates, offset,
 _ol_geom_flat_simplify_.douglasPeuckerss = function(
   flatCoordinates, offset, endss, stride, squaredTolerance,
   simplifiedFlatCoordinates, simplifiedOffset, simplifiedEndss) {
-  let i, ii;
-  for (i = 0, ii = endss.length; i < ii; ++i) {
+  for (let i = 0, ii = endss.length; i < ii; ++i) {
     const ends = endss[i];
     const simplifiedEnds = [];
     simplifiedOffset = _ol_geom_flat_simplify_.douglasPeuckers(
@@ -356,8 +353,7 @@ _ol_geom_flat_simplify_.quantizes = function(
   flatCoordinates, offset, ends, stride,
   tolerance,
   simplifiedFlatCoordinates, simplifiedOffset, simplifiedEnds) {
-  let i, ii;
-  for (i = 0, ii = ends.length; i < ii; ++i) {
+  for (let i = 0, ii = ends.length; i < ii; ++i) {
     const end = ends[i];
     simplifiedOffset = _ol_geom_flat_simplify_.quantize(
       flatCoordinates, offset, end, stride,
@@ -386,8 +382,7 @@ _ol_geom_flat_simplify_.quantizess = function(
   flatCoordinates, offset, endss, stride,
   tolerance,
   simplifiedFlatCoordinates, simplifiedOffset, simplifiedEndss) {
-  let i, ii;
-  for (i = 0, ii = endss.length; i < ii; ++i) {
+  for (let i = 0, ii = endss.length; i < ii; ++i) {
     const ends = endss[i];
     const simplifiedEnds = [];
     simplifiedOffset = _ol_geom_flat_simplify_.quantizes(