test

Author: birkskyum

src/util/interpolate.test.ts

@@ -125,7 +125,7 @@ describe('interpolate', () => {
 
         const i11nFn = (t: number) => interpolate.projection(Globe, Mercator, t);
         expect(i11nFn(0.5)).toBeInstanceOf(ProjectionTransition);
-        expect(i11nFn(0.5).toString()).toBe('["globe-to-mercator", 0.5]');
+        expect(i11nFn(0.5).toString()).toBe('["globe", "mercator", 0.5]');
     });
 
     describe('interpolate variableAnchorOffsetCollection', () => {

src/util/projection.test.ts

@@ -5,8 +5,8 @@ const Mercator = new Projection('mercator');
 
 describe('Projection class', () => {
     test('should serialize transition to string format', () => {
-        expect(`${new ProjectionTransition(Mercator, Globe, 0.2)}`).toBe('["mercator-to-globe", 0.2]');
-        expect(`${new ProjectionTransition(Globe, Mercator, 0.1)}`).toBe('["globe-to-mercator", 0.1]'); 
+        expect(`${new ProjectionTransition(Mercator, Globe, 0.2)}`).toBe('["mercator", "globe", 0.2]');
+        expect(`${new ProjectionTransition(Globe, Mercator, 0.1)}`).toBe('["globe", "mercator", 0.1]'); 
     });
 
     test('should serialize single projection to string format', () => {

src/util/projection.ts

@@ -13,17 +13,18 @@ export class Projection {
 
 export class ProjectionTransition {
 
-    projection: string;
-    interpolation;
+    from: Projection;
+    to: Projection;
+    interpolation: number;
+    
 
     constructor(from: Projection, to: Projection, interpolation: number) {
-        
-        this.projection = `${from}-to-${to}`;
+        this.from = from;
+        this.to = to;
         this.interpolation = interpolation;
-
     }
 
     toString(): string {
-        return `["${this.projection}", ${this.interpolation}]`;
+        return `["${this.from}", "${this.to}", ${this.interpolation}]`;
     }
 }