Tidy

Author: felixpalmer

modules/carto/src/layers/trajectory-tile-layer.ts

@@ -59,11 +59,11 @@ function getLineColorFromFillColor(getFillColor: TrajectoryTileLayerProps['getFi
     const endIndex = data.startIndices[index + 1];
     const nVertices = endIndex - startIndex;
     const colors = new Array(nVertices).fill(0).map((_, i) => {
-      const index = startIndex + i;
-      const properties = createBinaryProxy(data, index);
-      const d = {properties} as any;
+      const vertexIndex = startIndex + i;
+      const properties = createBinaryProxy(data, vertexIndex);
+      const vertex = {properties} as any;
       return typeof getFillColor === 'function'
-        ? getFillColor(d, {index, data, target})
+        ? getFillColor(vertex, {index: vertexIndex, data, target})
         : getFillColor;
     });
 

modules/carto/src/layers/trajectory-utils.ts

@@ -201,8 +201,8 @@ export function rebuildGeometry(
   const newNumericProps: NumericProps = {};
   const numericPropKeys = Object.keys(numericProps);
   for (const prop of numericPropKeys) {
-    const size = numericProps[prop].size || 1;
-    newNumericProps[prop] = {value: new Float32Array(newN), size};
+    const propSize = numericProps[prop].size || 1;
+    newNumericProps[prop] = {value: new Float32Array(newN), size: propSize};
   }
 
   // Properties are per-line.
@@ -224,9 +224,12 @@ export function rebuildGeometry(
 
     for (const prop of numericPropKeys) {
       const {value: originalValue} = originalGeometry.numericProps[prop];
-      const {value, size} = newNumericProps[prop];
-      const dataSlice = originalValue.subarray(srcIndex * size, (srcIndex + numVertices) * size);
-      value.set(dataSlice, dst * size);
+      const {value, size: propSize} = newNumericProps[prop];
+      const dataSlice = originalValue.subarray(
+        srcIndex * propSize,
+        (srcIndex + numVertices) * propSize
+      );
+      value.set(dataSlice, dst * propSize);
     }
     dst += numVertices;
   }
@@ -266,7 +269,7 @@ export function transformTrajectoryData(
   }
 
   // Step 1: Extract trajectory and timestamp data
-  const {tripIds, timestamps, properties} = extractTrajectoryData(
+  const {tripIds, timestamps} = extractTrajectoryData(
     geometry,
     trajectoryIdColumn,
     timestampColumn,