tests

Author: birkskyum

src/util/interpolate.test.ts

@@ -125,7 +125,9 @@ describe('interpolate', () => {
 
         const i11nFn = (t: number) => interpolate.projection(Globe, Mercator, t);
         expect(i11nFn(0.5)).toBeInstanceOf(Projection);
-        expect(i11nFn(0.5)).toEqual(['globe', 'mercator', 0.5]);
+        expect(i11nFn(0.5).from).toEqual({"from": "globe", "transition": 1, "to": "globe"});
+        expect(i11nFn(0.5).to).toEqual({"from": "mercator", "transition": 1, "to": "mercator"});
+        expect(i11nFn(0.5).transition).toEqual(0.5);
     });
 
     describe('interpolate variableAnchorOffsetCollection', () => {

src/util/projection.test.ts

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

src/util/projection.ts

@@ -6,16 +6,16 @@ export class Projection {
 
     from: string | Projection;
     to: string | Projection;
-    interpolation: number;
+    transition: number;
 
     constructor(from: string | Projection, to: string | Projection, interpolation: number) {
         this.from = from;
         this.to = to;
-        this.interpolation = interpolation;
+        this.transition = interpolation;
     }
 
     toString(): string {
-        return `["${this.from}", "${this.to}", ${this.interpolation}]`;
+        return `["${this.from}", "${this.to}", ${this.transition}]`;
     }
 }