Better variables scoping

src/ol/geom/flat/area.js

@@ -35,8 +35,7 @@ _ol_geom_flat_area_.linearRing = function(flatCoordinates, offset, end, stride)
  */
 _ol_geom_flat_area_.linearRings = function(flatCoordinates, offset, ends, stride) {
   let area = 0;
-  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];
     area += _ol_geom_flat_area_.linearRing(flatCoordinates, offset, end, stride);
     offset = end;
@@ -54,11 +53,9 @@ _ol_geom_flat_area_.linearRings = function(flatCoordinates, offset, ends, stride
  */
 _ol_geom_flat_area_.linearRingss = function(flatCoordinates, offset, endss, stride) {
   let area = 0;
-  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];
-    area +=
-        _ol_geom_flat_area_.linearRings(flatCoordinates, offset, ends, stride);
+    area += _ol_geom_flat_area_.linearRings(flatCoordinates, offset, ends, stride);
     offset = ends[ends.length - 1];
   }
   return area;

src/ol/geom/flat/interpolate.js

@@ -32,8 +32,7 @@ _ol_geom_flat_interpolate_.lineString = function(flatCoordinates, offset, end, s
     let y1 = flatCoordinates[offset + 1];
     let length = 0;
     const cumulativeLengths = [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));
@@ -118,8 +117,7 @@ _ol_geom_flat_interpolate_.lineStringCoordinateAtM = function(flatCoordinates, o
   const m1 = flatCoordinates[(lo + 1) * stride - 1];
   const t = (m - m0) / (m1 - m0);
   coordinate = [];
-  let i;
-  for (i = 0; i < stride - 1; ++i) {
+  for (let i = 0; i < stride - 1; ++i) {
     coordinate.push(lerp(flatCoordinates[(lo - 1) * stride + i],
       flatCoordinates[lo * stride + i], t));
   }
@@ -163,8 +161,7 @@ _ol_geom_flat_interpolate_.lineStringsCoordinateAtM = function(
       return null;
     }
   }
-  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];
     if (offset == end) {
       continue;

src/ol/geom/flat/orient.js

@@ -44,8 +44,7 @@ _ol_geom_flat_orient_.linearRingIsClockwise = function(flatCoordinates, offset,
  */
 _ol_geom_flat_orient_.linearRingsAreOriented = function(flatCoordinates, offset, ends, stride, opt_right) {
   const right = opt_right !== undefined ? opt_right : false;
-  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];
     const isClockwise = _ol_geom_flat_orient_.linearRingIsClockwise(
       flatCoordinates, offset, end, stride);
@@ -78,8 +77,7 @@ _ol_geom_flat_orient_.linearRingsAreOriented = function(flatCoordinates, offset,
  * @return {boolean} Rings are correctly oriented.
  */
 _ol_geom_flat_orient_.linearRingssAreOriented = function(flatCoordinates, offset, endss, stride, opt_right) {
-  let i, ii;
-  for (i = 0, ii = endss.length; i < ii; ++i) {
+  for (let i = 0, ii = endss.length; i < ii; ++i) {
     if (!_ol_geom_flat_orient_.linearRingsAreOriented(
       flatCoordinates, offset, endss[i], stride, opt_right)) {
       return false;
@@ -104,8 +102,7 @@ _ol_geom_flat_orient_.linearRingssAreOriented = function(flatCoordinates, offset
  */
 _ol_geom_flat_orient_.orientLinearRings = function(flatCoordinates, offset, ends, stride, opt_right) {
   const right = opt_right !== undefined ? opt_right : false;
-  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];
     const isClockwise = _ol_geom_flat_orient_.linearRingIsClockwise(
       flatCoordinates, offset, end, stride);
@@ -135,8 +132,7 @@ _ol_geom_flat_orient_.orientLinearRings = function(flatCoordinates, offset, ends
  * @return {number} End.
  */
 _ol_geom_flat_orient_.orientLinearRingss = function(flatCoordinates, offset, endss, stride, opt_right) {
-  let i, ii;
-  for (i = 0, ii = endss.length; i < ii; ++i) {
+  for (let i = 0, ii = endss.length; i < ii; ++i) {
     offset = _ol_geom_flat_orient_.orientLinearRings(
       flatCoordinates, offset, endss[i], stride, opt_right);
   }

src/ol/geom/flat/transform.js

@@ -16,8 +16,7 @@ const _ol_geom_flat_transform_ = {};
 _ol_geom_flat_transform_.transform2D = function(flatCoordinates, offset, end, stride, transform, opt_dest) {
   const dest = opt_dest ? opt_dest : [];
   let i = 0;
-  let j;
-  for (j = offset; j < end; j += stride) {
+  for (let j = offset; j < end; j += stride) {
     const x = flatCoordinates[j];
     const y = flatCoordinates[j + 1];
     dest[i++] = transform[0] * x + transform[2] * y + transform[4];
@@ -109,11 +108,10 @@ _ol_geom_flat_transform_.scale = function(flatCoordinates, offset, end, stride,
 _ol_geom_flat_transform_.translate = function(flatCoordinates, offset, end, stride, deltaX, deltaY, opt_dest) {
   const dest = opt_dest ? opt_dest : [];
   let i = 0;
-  let j, k;
-  for (j = offset; j < end; j += stride) {
+  for (let j = offset; j < end; j += stride) {
     dest[i++] = flatCoordinates[j] + deltaX;
     dest[i++] = flatCoordinates[j + 1] + deltaY;
-    for (k = j + 2; k < j + stride; ++k) {
+    for (let k = j + 2; k < j + stride; ++k) {
       dest[i++] = flatCoordinates[k];
     }
   }