pull values from spec

Author: birkskyum

build/generate-style-spec.ts

@@ -118,14 +118,16 @@ function layerType(key) {
 
 const layerTypes = Object.keys(spec.layer.type.values);
 
+const projectionTypes = spec.projection.type.values;
+
 fs.writeFileSync('src/types.g.ts',
     `// Generated code; do not edit. Edit build/generate-style-spec.ts instead.
 /* eslint-disable */
 
 export type ColorSpecification = string;
 
-export type ProjectionPreset = 'globe';
-export type ProjectionPrimitive = 'mercator' | 'stereographic';
+export type ProjectionPreset = ${projectionTypes.presets.map(p => `'${p}'`).join(' | ')};
+export type ProjectionPrimitive =  ${projectionTypes.projections.map(p => `'${p}'`).join(' | ')};
 export type ProjectionTransition = [ProjectionPrimitive, ProjectionPrimitive, number];
 export type ProjectionTransitionSpecification = ProjectionPreset | ProjectionPrimitive | ProjectionTransition | PropertyValueSpecification<ProjectionTransition>
 

docs/types.md

@@ -168,13 +168,13 @@ Use a [`camera expression`](./expressions.md#camera-expressions), to discretely
 
 ```ts
 type: ["step", ["zoom"],
-    "globe",
+    "stereographic",
     11, "mercator"
 ]
 ```
 
-`output at zoom 10.9: ["globe", "globe", 1]`
-`output at zoom 11.0: ["globe", "globe", 1]`
+`output at zoom 10.9: ["stereographic", "stereographic", 1]`
+`output at zoom 11.0: ["stereographic", "stereographic", 1]`
 `output at zoom 11.1: ["mercator", "mercator", 1]`
 
 #### Animate between different projections based on zoom level**

src/util/interpolate.test.ts

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

src/util/projection.test.ts

@@ -3,7 +3,7 @@ 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(`${new Projection('mercator', 'stereographic', 1)}`).toBe('["mercator", "stereographic", 1]');
+        expect(`${new Projection('stereographic', 'mercator', 0.3)}`).toBe('["stereographic", "mercator", 0.3]');
     });
 });

src/util/projection.ts

@@ -1,3 +1,4 @@
+import v8 from '../reference/v8.json' with { type: 'json' };
 import {ProjectionPrimitive, ProjectionTransition, ProjectionTransitionSpecification, PropertyValueSpecification} from '../types.g';
 
 export class Projection {
@@ -36,9 +37,9 @@ export function isProjectionTransitionValue(value: unknown): value is Projection
 }
 
 export function isProjectionPrimitive(value: unknown): value is ProjectionPrimitive {
-    return value === 'mercator' || value === 'stereographic';
+    return v8.projection.type.values.projections.includes(value as string);
 }
 
 export function isProjectionPreset(value: unknown): value is ProjectionPrimitive {
-    return value === 'globe';
+    return v8.projection.type.values.presets.includes(value as string);
 }

src/validate/validate_projection_type.test.ts

@@ -1,3 +1,4 @@
+import v8 from '../reference/v8.json' with {type: 'json'};
 import validateProjectionTransition from './validate_projection_type';
 
 describe('validateProjectionTransition function', () => {
@@ -23,12 +24,8 @@ describe('validateProjectionTransition function', () => {
     });
 
     test('should return no errors when projectionTransition is valid projection string', () => {
-        const validProjectionTransitionString = [
-            'mercator',
-            'stereographic',
-            'globe',
-        ];
-
+        const validProjectionTransitionString = [...v8.projection.type.values.presets, ...v8.projection.type.values.projections] 
+        
         for (const value of validProjectionTransitionString) {
             const errors = validateProjectionTransition({key, value});
             expect(errors).toHaveLength(0);