interpolate

Author: birkskyum

src/expression/definitions/interpolate.ts

@@ -175,14 +175,14 @@ class Interpolate implements Expression {
         const outputUpper = outputs[index + 1].evaluate(ctx);
 
         if (this.type.kind === 'projectionTransition') {
-            return interpolate.projection(outputLower, outputUpper, t);
+            return interpolate.projectionTransition(outputLower, outputUpper, t);
         }
 
         switch (this.operator) {
             case 'interpolate':
                 return interpolate[this.type.kind](outputLower, outputUpper, t);
             case 'interpolate-projection':
-                return interpolate.projection(outputLower, outputUpper, t);
+                return interpolate.projectionTransition(outputLower, outputUpper, t);
             case 'interpolate-hcl':
                 return interpolate.color(outputLower, outputUpper, t, 'hcl');
             case 'interpolate-lab':

src/util/interpolate.test.ts

@@ -119,7 +119,7 @@ describe('interpolate', () => {
     });
 
     test('interpolate projection', () => {
-        const i11nFn = (t: number) => interpolate.projection('stereographic', 'mercator', t);
+        const i11nFn = (t: number) => interpolate.projectionTransition('stereographic', 'mercator', t);
         expect(i11nFn(0.5)).toBeInstanceOf(ProjectionTransition);
         expect(`${i11nFn(0.5)}`).toBe('["stereographic", "mercator", 0.5]');
     });

src/util/interpolate.ts

@@ -24,11 +24,11 @@ export function isSupportedInterpolationColorSpace(colorSpace: string): colorSpa
  * @returns interpolation fn
  * @deprecated use `interpolate[type]` instead
  */
-export const interpolateFactory = (interpolationType: 'number'|'color'|'projection'|'array'|'padding'|'variableAnchorOffsetCollection') => {
+export const interpolateFactory = (interpolationType: 'number'|'color'|'projectionTransition'|'array'|'padding'|'variableAnchorOffsetCollection') => {
     switch (interpolationType) {
         case 'number': return number;
         case 'color': return color;
-        case 'projection': return projection;
+        case 'projectionTransition': return projectionTransition;
         case 'array': return array;
         case 'padding': return padding;
         case 'variableAnchorOffsetCollection': return variableAnchorOffsetCollection;
@@ -39,7 +39,7 @@ function number(from: number, to: number, t: number): number {
     return from + t * (to - from);
 }
 
-function projection(from: ProjectionPrimitiveT, to: ProjectionPrimitiveT, interpolation: number): ProjectionTransition {
+function projectionTransition(from: ProjectionPrimitiveT, to: ProjectionPrimitiveT, interpolation: number): ProjectionTransition {
     return new ProjectionTransition(from, to, interpolation);
 }
 
@@ -128,7 +128,7 @@ function variableAnchorOffsetCollection(from: VariableAnchorOffsetCollection, to
 const interpolate = {
     number,
     color,
-    projection,
+    projectionTransition,
     array,
     padding,
     variableAnchorOffsetCollection