projectionType

Author: birkskyum

build/generate-style-spec.ts

@@ -124,10 +124,9 @@ fs.writeFileSync('src/types.g.ts',
 
 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 ProjectionTypeSpecification = PrimitiveProjection | ProjectionTransition | PropertyValueSpecification<ProjectionTransition>
 
 
 export type PaddingSpecification = number | number[];
@@ -327,6 +326,8 @@ ${objectDeclaration('LightSpecification', spec.light)}
 
 ${objectDeclaration('SkySpecification', spec.sky)}
 
+${objectDeclaration('ProjectionSpecification', spec.projection)}
+
 ${objectDeclaration('TerrainSpecification', spec.terrain)}
 
 ${spec.source.map(key => {

docs/types.md

@@ -134,9 +134,9 @@ The following example applies 2em padding on top and bottom and 3em padding left
 }
 ```
 
-## Projection Mode
+## Projection Type
 
-There are currently two projection modes implemented.
+There are currently two projection types implemented.
 
 - `mercator` - A web mercator projection
 - `globe` - A spherical projection

src/reference/v8.json

@@ -129,7 +129,7 @@
       "type": "projection",
       "doc": "The projection type. Can be specified as a string, or as an expression for supported projection types.",
       "example": {
-        "mode": [
+        "type": [
           "interpolate-projection",
           ["linear"],
           ["zoom"],
@@ -4576,8 +4576,8 @@
     }
   },
   "projection": {
-    "mode": {
-      "type": "projection-mode",
+    "type": {
+      "type": "projectionType",
       "doc": "The projection type. Can be specified as a string, or as an expression for supported projection types.",
       "default": "mercator",
       "expression": {

src/util/projection.ts

@@ -1,4 +1,4 @@
-import {PrimitiveProjection, ProjectionTransition, ProjectionType, PropertyValueSpecification} from '../types.g';
+import {PrimitiveProjection, ProjectionTransition, ProjectionTypeSpecification, PropertyValueSpecification} from '../types.g';
 
 export class Projection {
     readonly from: PrimitiveProjection;
@@ -25,7 +25,7 @@ export class Projection {
     }
 }
 
-export function isProjectionType(value: unknown): value is ProjectionType {
+export function isProjectionType(value: unknown): value is ProjectionTypeSpecification {
     return isPrimitiveProjection(value) || isProjectionTransition(value) || isPropertyValueSpecification(value);
 }
 

src/validate/validate.ts

@@ -27,7 +27,7 @@ import validateVariableAnchorOffsetCollection from './validate_variable_anchor_o
 import validateSprite from './validate_sprite';
 import ValidationError from '../error/validation_error';
 import validateProjection from './validate_projection';
-import validateProjectionMode from './validate_projection-mode';
+import validateProjectionType from './validate_projection-type';
 
 const VALIDATORS = {
     '*'() {
@@ -48,7 +48,7 @@ const VALIDATORS = {
     'sky': validateSky,
     'terrain': validateTerrain,
     'projection': validateProjection,
-    'projection-mode': validateProjectionMode,
+    'projectionType': validateProjectionType,
     'string': validateString,
     'formatted': validateFormatted,
     'resolvedImage': validateImage,

src/validate/validate_projection-mode.ts renamed to src/validate/validate_projection-type.ts

@@ -1,19 +1,19 @@
 import ValidationError from '../error/validation_error';
 import getType from '../util/get_type';
 import v8 from '../reference/v8.json' with {type: 'json'};
-import {ProjectionType, StyleSpecification} from '../types.g';
+import {ProjectionTypeSpecification, StyleSpecification} from '../types.g';
 import {isPrimitiveProjection, isProjectionTransition, isProjectionType} from '../util/projection';
 
 interface ValidateProjectionOptions {
     sourceName?: string;
-    value: ProjectionType;
+    value: ProjectionTypeSpecification;
     styleSpec: typeof v8;
     style: StyleSpecification;
     validateSpec: Function;
 }
 
 export default function validateProjectionMode(options: ValidateProjectionOptions) {
-    const projectionType: ProjectionType = options.value;
+    const projectionType: ProjectionTypeSpecification = options.value;
 
     if (!projectionType){