use projection class

Author: birkskyum

build/generate-style-spec.ts

@@ -126,8 +126,8 @@ export type ColorSpecification = string;
 
 export type ProjectionSpecification = {"mode":ProjectionType}
 export type PrimitiveProjection = 'mercator' | 'globe';
-export type ProjectionTransition = [PrimitiveProjection, PrimitiveProjection, number];
-export type ProjectionType = PrimitiveProjection | ProjectionTransition | PropertyValueSpecification<ProjectionTransition>
+export type PrimitiveTransition = [PrimitiveProjection, PrimitiveProjection, number];
+export type ProjectionType = PrimitiveProjection | PrimitiveTransition | PropertyValueSpecification<PrimitiveTransition>
 
 
 export type PaddingSpecification = number | number[];

src/expression/values.ts

@@ -8,8 +8,7 @@ import ResolvedImage from './types/resolved_image';
 import {NullType, NumberType, StringType, BooleanType, ColorType, ObjectType, ValueType, CollatorType, FormattedType, ResolvedImageType, array, PaddingType, VariableAnchorOffsetCollectionType, ProjectionType} from './types';
 
 import type {Type} from './types';
-import {ProjectionTransition, isProjectionTransition} from '../types.g';
-import { Projection } from '../util/projection';
+import {Projection} from '../util/projection';
 
 export function validateRGBA(r: unknown, g: unknown, b: unknown, a?: unknown): string | null {
     if (!(
@@ -30,7 +29,7 @@ export function validateRGBA(r: unknown, g: unknown, b: unknown, a?: unknown): s
     return null;
 }
 
-export type Value = null | string | boolean | number | Color | ProjectionTransition | Collator | Formatted | Padding | ResolvedImage | VariableAnchorOffsetCollection | ReadonlyArray<Value> | {
+export type Value = null | string | boolean | number | Color | Projection | Collator | Formatted | Padding | ResolvedImage | VariableAnchorOffsetCollection | ReadonlyArray<Value> | {
     readonly [x: string]: Value;
 };
 
@@ -77,7 +76,7 @@ export function typeOf(value: Value): Type {
         return NumberType;
     } else if (value instanceof Color) {
         return ColorType;
-    } else if (isProjectionTransition(value)) {
+    } else if (value instanceof Projection) {
         return ProjectionType;
     } else if (value instanceof Collator) {
         return CollatorType;
@@ -117,11 +116,11 @@ export function toString(value: Value) {
         return '';
     } else if (type === 'string' || type === 'number' || type === 'boolean') {
         return String(value);
-    } else if (value instanceof Color || isProjectionTransition(value) || value instanceof Formatted || value instanceof Padding || value instanceof VariableAnchorOffsetCollection || value instanceof ResolvedImage) {
+    } else if (value instanceof Color || value instanceof Projection || value instanceof Formatted || value instanceof Padding || value instanceof VariableAnchorOffsetCollection || value instanceof ResolvedImage) {
         return value.toString();
     } else {
         return JSON.stringify(value);
     }
 }
 
-export {Color, Collator, ProjectionTransition as Projection, Padding, VariableAnchorOffsetCollection};
+export {Color, Collator, Projection, Padding, VariableAnchorOffsetCollection};

src/util/interpolate.test.ts

@@ -3,8 +3,7 @@ import interpolate, {isSupportedInterpolationColorSpace} from './interpolate';
 import Color from './color';
 import Padding from './padding';
 import VariableAnchorOffsetCollection from './variable_anchor_offset_collection';
-import {isProjectionTransition} from '../types.g';
-import { Projection } from './projection';
+import {Projection} from './projection';
 
 describe('interpolate', () => {
 

src/util/projection.test.ts

@@ -2,12 +2,10 @@ import {Projection} from './projection';
 
 describe('Projection class', () => {
 
-
     test('should serialize to rgba format', () => {
         expect(`${new Projection('mercator', 'globe', 1)}`).toBe('["mercator", "globe", 1]');
         expect(`${new Projection('globe', 'mercator', 0.3)}`).toBe('["globe", "mercator", 0.3]');
         expect(`${Projection.parse('globe')}`).toBe('["globe", "globe", 1]');
         expect(`${Projection.parse('mercator')}`).toBe('["mercator", "mercator", 1]');
     });
-
 });

src/validate/validate_projection-mode.ts

@@ -1,7 +1,8 @@
 import ValidationError from '../error/validation_error';
 import getType from '../util/get_type';
 import v8 from '../reference/v8.json' with {type: 'json'};
-import {isPrimitiveProjection, isProjectionTransition, isProjectionType, ProjectionType, StyleSpecification} from '../types.g';
+import {ProjectionType, StyleSpecification} from '../types.g';
+import { isPrimitiveProjection, isProjectionTransition, isProjectionType } from '../util/projection';
 
 interface ValidateProjectionOptions {
     sourceName?: string;