type

Author: birkskyum

build/generate-docs.ts

@@ -166,7 +166,7 @@ function typeToMarkdownLink(type: string): string {
         case 'promoteid':
             return ` [${type}](types.md)`;
         case 'color':
-        case 'projection-mode':
+        case 'projectiontype':
         case 'number':
         case 'string':
         case 'boolean':

docs/types.md

@@ -138,8 +138,8 @@ The following example applies 2em padding on top and bottom and 3em padding left
 
 There are currently two projection types implemented.
 
-- `mercator` - A web mercator projection
-- `globe` - A spherical projection
+- `mercator` - Web Mercator projection
+- `globe` - Globe projection
 
 
 **Use a single projection**

src/index.test.ts

@@ -70,7 +70,7 @@ function validSchema(k, v, obj, ref, version, kind) {
         'padding',
         'variableAnchorOffsetCollection',
         'sprite',
-        'projection-mode'
+        'projectionType'
     ]);
     const keys = [
         'default',

src/util/interpolate.ts

@@ -24,11 +24,11 @@ export function isSupportedInterpolationColorSpace(colorSpace: string): colorSpa
  * @returns interpolation fn
  * @deprecated use `interpolate[type]` instead
  */
-export const interpolateFactory = (interpolationType: 'number'|'color'|'projection-mode'|'array'|'padding'|'variableAnchorOffsetCollection') => {
+export const interpolateFactory = (interpolationType: 'number'|'color'|'projectionType'|'array'|'padding'|'variableAnchorOffsetCollection') => {
     switch (interpolationType) {
         case 'number': return number;
         case 'color': return color;
-        case 'projection-mode': return projection;
+        case 'projectionType': return projection;
         case 'array': return array;
         case 'padding': return padding;
         case 'variableAnchorOffsetCollection': return variableAnchorOffsetCollection;

src/validate/validate_projection-type.ts

@@ -17,7 +17,7 @@ export default function validateProjectionMode(options: ValidateProjectionOption
 
     if (!projectionType){
 
-        return [new ValidationError('projection-mode', projectionType, 'projection mode is missing')];
+        return [new ValidationError('projection.type', projectionType, 'value is missing')];
     }
 
     const rootType = getType(projectionType);
@@ -26,13 +26,11 @@ export default function validateProjectionMode(options: ValidateProjectionOption
     } 
 
     if (rootType === 'string' && !isPrimitiveProjection(projectionType)) {
-        return [new ValidationError('projection-mode', projectionType, 'does not fit the type PrimitiveProjection')];
-    } else if (rootType === 'object' && !isProjectionTransition(projectionType)) {
-        return [new ValidationError('projection-mode', projectionType, 'does not fit the type ProjectionTransition')];
+        return [new ValidationError('projection.type', projectionType, `found "${projectionType}", expected "mercator" or "globe".`)];
     } else if (rootType === 'array' && !isProjectionType(projectionType)) {
-        return [new ValidationError('projection-mode', projectionType, 'does not fit the type ProjectionType')];
-    }  else if (!['array', 'object', 'string'].includes(rootType)) {
-        return [new ValidationError('projection-mode', projectionType, `expected array, object, string - found ${rootType}`)];
+        return [new ValidationError('projection.type', projectionType, `incorrect syntax, found ${JSON.parse(projectionType)}.`)];
+    }  else if (!['array', 'string'].includes(rootType)) {
+        return [new ValidationError('projection.type', projectionType, `found value of type "${rootType}", expected string or array`)];
     } 
     return [];
 }