Lint fixes

Author: felixpalmer

modules/carto/src/layers/edged-layers.ts

@@ -96,4 +96,4 @@ export class EdgedTripsLayer extends TripsLayer {
     patchShaders(shaders, (this.props as any).outline || 'none');
     return shaders;
   }
-}
+}

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

@@ -19,52 +19,54 @@ function distanceBetweenPoints([lon1, lat1, lon2, lat2]: number[]): number {
   return R * 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
 }
 
-
 /**
  * Calculate speeds and write to numericProps attribute for trajectory geometry
  */
 export function autocomputeSpeed(geometry: ProcessedGeometry): void {
   const {positions, attributes} = geometry;
   const n = positions.value.length / positions.size;
-  geometry.numericProps.speed = { value: new Float32Array(n), size: 1 };
-  
+  geometry.numericProps.speed = {value: new Float32Array(n), size: 1};
+
   // Calculate speed and write to numericProps
   let previousSpeed = 0;
-  
+
   for (let i = 0; i < n; i++) {
     let speed = 0;
-    
+
     if (i < n - 1) {
       const start = i === n - 1 ? i - 1 : i;
-      const step = positions.value.subarray(positions.size * start, positions.size * start + 2 * positions.size);
+      const step = positions.value.subarray(
+        positions.size * start,
+        positions.size * start + 2 * positions.size
+      );
       let lat1: number = 0;
       let lat2: number = 0;
       let lon1: number = 0;
       let lon2: number = 0;
-      
+
       if (positions.size === 2) {
         [lon1, lat1, lon2, lat2] = step;
       } else if (positions.size === 3) {
         [lon1, lat1, , lon2, lat2] = step; // skip altitude values
       }
-      
+
       const deltaP = distanceBetweenPoints([lon1, lat1, lon2, lat2]);
       const [t1, t2] = attributes.getTimestamps.value.subarray(start, start + 2);
       const deltaT = t2 - t1;
       speed = deltaT > 0 ? deltaP / deltaT : previousSpeed;
-      
+
       if (deltaT === 0) {
         speed = previousSpeed;
       }
-      
+
       previousSpeed = speed;
     }
-    
+
     if (speed === 0) {
       speed = 100; // fallback speed
     }
-    
+
     // Write speed to numericProps
-    geometry.numericProps.speed!.value[i] = speed;
+    geometry.numericProps.speed.value[i] = speed;
   }
-}
+}

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

@@ -7,7 +7,7 @@ import {_Tile2DHeader, TripsLayer, TripsLayerProps} from '@deck.gl/geo-layers';
 import {GeoJsonLayer} from '@deck.gl/layers';
 
 import type {TilejsonResult} from '@carto/api-client';
-import VectorTileLayer, { VectorTileLayerProps } from './vector-tile-layer';
+import VectorTileLayer, {VectorTileLayerProps} from './vector-tile-layer';
 import {transformTrajectoryData, type TileBounds, normalizeTimestamp} from './trajectory-utils';
 import {autocomputeSpeed} from './trajectory-speed-utils';
 import {createBinaryProxy, createEmptyBinary} from '../utils';
@@ -24,7 +24,10 @@ const defaultProps: DefaultProps<TrajectoryTileLayerProps> = {
 /** All properties supported by TrajectoryTileLayer. */
 export type TrajectoryTileLayerProps<FeaturePropertiesT = unknown> = _TrajectoryTileLayerProps &
   Omit<TripsLayerProps<FeaturePropertiesT>, 'data'> &
-  Pick<VectorTileLayerProps<FeaturePropertiesT>, 'getFillColor' | 'getLineColor' | 'uniqueIdProperty'>;
+  Pick<
+    VectorTileLayerProps<FeaturePropertiesT>,
+    'getFillColor' | 'getLineColor' | 'uniqueIdProperty'
+  >;
 
 /** Properties added by TrajectoryTileLayer. */
 type _TrajectoryTileLayerProps = {
@@ -46,8 +49,8 @@ type _TrajectoryTileLayerProps = {
 /**
  * Helper function to wrap `getFillColor` accessor into a `getLineColor` accessor
  * which will invoke `getFillColor` for each vertex in the line
- * @param getFillColor 
- * @returns 
+ * @param getFillColor
+ * @returns
  */
 function getLineColorFromFillColor(getFillColor: TrajectoryTileLayerProps['getFillColor']) {
   return (d: any, info: any) => {
@@ -58,12 +61,14 @@ function getLineColorFromFillColor(getFillColor: TrajectoryTileLayerProps['getFi
     const colors = new Array(nVertices).fill(0).map((_, i) => {
       const index = startIndex + i;
       const properties = createBinaryProxy(data, index);
-      const d = { properties } as any;
-      return typeof getFillColor === 'function' ? getFillColor(d, { index, data, target }) : getFillColor;
+      const d = {properties} as any;
+      return typeof getFillColor === 'function'
+        ? getFillColor(d, {index, data, target})
+        : getFillColor;
     });
 
     return colors;
-  }
+  };
 }
 
 // @ts-ignore
@@ -90,18 +95,22 @@ export default class TrajectoryTileLayer<
     super.updateState(parameters);
     if (parameters.props.data && parameters.props.data.widgetSource) {
       const dataSourceProps = parameters.props.data.widgetSource.props;
-      const { trajectoryIdColumn, timestampColumn } = dataSourceProps;
-      
+      const {trajectoryIdColumn, timestampColumn} = dataSourceProps;
+
       if (!trajectoryIdColumn) {
-        throw new Error('TrajectoryTileLayer: trajectoryIdColumn is required in data source configuration');
+        throw new Error(
+          'TrajectoryTileLayer: trajectoryIdColumn is required in data source configuration'
+        );
       }
       if (!timestampColumn) {
-        throw new Error('TrajectoryTileLayer: timestampColumn is required in data source configuration');
+        throw new Error(
+          'TrajectoryTileLayer: timestampColumn is required in data source configuration'
+        );
       }
-      
+
       this.setState({trajectoryIdColumn, timestampColumn});
     }
-    
+
     // Read timestampRange from the data source (tilejson)
     if (parameters.props.data && parameters.props.data.timestampRange) {
       const {min, max} = parameters.props.data.timestampRange;
@@ -119,7 +128,7 @@ export default class TrajectoryTileLayer<
     const tileBounds = tile.bbox as TileBounds;
     const {minTime, maxTime} = this.state;
 
-    let lines = transformTrajectoryData(
+    const lines = transformTrajectoryData(
       data.points,
       this.state.trajectoryIdColumn,
       this.state.timestampColumn,
@@ -131,7 +140,7 @@ export default class TrajectoryTileLayer<
     if (this.props.autocomputeSpeed) {
       autocomputeSpeed(lines);
     }
-    return { ...createEmptyBinary(), lines }
+    return {...createEmptyBinary(), lines};
   }
 
   renderSubLayers(
@@ -140,7 +149,7 @@ export default class TrajectoryTileLayer<
       data: any;
       _offset: number;
       tile: _Tile2DHeader;
-      _subLayerProps: CompositeLayerProps["_subLayerProps"];
+      _subLayerProps: CompositeLayerProps['_subLayerProps'];
     }
   ): GeoJsonLayer | GeoJsonLayer[] | null {
     if (props.data === null) {
@@ -150,7 +159,7 @@ export default class TrajectoryTileLayer<
     // This may not be as efficient as just rendering a PathLayer, but it allows to
     // switch between the render modes without reloading data
     const showTrips = props.renderMode === 'trips';
-    
+
     // Normalize currentTime to match the normalized timestamps in the data
     const normalizedCurrentTime = props.currentTime! - this.state.minTime;
     const {minTime, maxTime} = this.state;
@@ -161,27 +170,29 @@ export default class TrajectoryTileLayer<
       widthUnits: props.widthUnits || 'pixels',
       lineJointRounded: props.jointRounded !== undefined ? props.jointRounded : true,
       capRounded: props.capRounded !== undefined ? props.capRounded : true,
-      _pathType: props._pathType || 'open',
+      _pathType: props._pathType || 'open'
     };
 
-    const getLineColor = props.getFillColor ? getLineColorFromFillColor(props.getFillColor) : props.getLineColor;
+    const getLineColor = props.getFillColor
+      ? getLineColorFromFillColor(props.getFillColor)
+      : props.getLineColor;
 
     const modifiedProps = {
       ...props,
       getLineColor,
       _subLayerProps: {
         ...props._subLayerProps,
         linestrings: {
-            type: TripsLayer,
-            currentTime: showTrips ? normalizedCurrentTime : totalTimeSpan,
-            trailLength: showTrips ? props.trailLength : totalTimeSpan,
-            parameters: {depthTest: false},
-            ...layerProps,
-            ...props._subLayerProps?.linestrings
-          }
+          type: TripsLayer,
+          currentTime: showTrips ? normalizedCurrentTime : totalTimeSpan,
+          trailLength: showTrips ? props.trailLength : totalTimeSpan,
+          parameters: {depthTest: false},
+          ...layerProps,
+          ...props._subLayerProps?.linestrings
+        }
       }
     };
 
     return super.renderSubLayers(modifiedProps as any);
   }
-}
+}