general-perspective

Author: birkskyum

docs/types.md

@@ -143,7 +143,7 @@ The `projection` is used to configure which projection to use for the map.
 There are currently two projections implemented.
 
 - `mercator` - [Web Mercator projection](https://en.wikipedia.org/wiki/Web_Mercator_projection)
-- `stereographic` - [Stereographic projection](https://en.wikipedia.org/wiki/Stereographic_projection)
+- `general-perspective` - [General Perspective projection](https://en.wikipedia.org/wiki/General_Perspective_projection)
 
 And the following [presets](#use-a-projection-preset)
 
@@ -166,38 +166,38 @@ Use a [`camera expression`](./expressions.md#camera-expressions), to discretely
 
 ```ts
 type: ["step", ["zoom"],
-    "stereographic",
+    "general-perspective",
     11, "mercator"
 ]
 
 
-output at zoom 10.9: ["stereographic", "stereographic", 1]
-output at zoom 11.0: ["stereographic", "stereographic", 1]
+output at zoom 10.9: ["general-perspective", "general-perspective", 1]
+output at zoom 11.0: ["general-perspective", "general-perspective", 1]
 output at zoom 11.1: ["mercator", "mercator", 1]
 ```
 
 #### Animate between different projections based on zoom level**
 
-Use a [`camera expression`](./expressions.md#camera-expressions), to animate between projections based on zoom, using [`interpolate-projection`](./expressions.md#interpolate-projection) function. The example below will yield an adaptive globe that interpolates from `stereographic` to `mercator` between zoom 10 and 12.
+Use a [`camera expression`](./expressions.md#camera-expressions), to animate between projections based on zoom, using [`interpolate-projection`](./expressions.md#interpolate-projection) function. The example below will yield an adaptive globe that interpolates from `general-perspective` to `mercator` between zoom 10 and 12.
 
 ```ts
 type: ["interpolate-projection", ["linear"], ["zoom"],
-    0,"stereographic",
-    10,"stereographic",
+    0,"general-perspective",
+    10,"general-perspective",
     12,"mercator"
 ]
 
 
-output at zoom 10: ["stereographic", "stereographic", 1]
-output at zoom 11: ["stereographic", "mercator", 0.5]
+output at zoom 10: ["general-perspective", "general-perspective", 1]
+output at zoom 11: ["general-perspective", "mercator", 0.5]
 output at zoom 12: ["mercator", "mercator", 1]
 ```
 
 
 #### Provide a `projection` 
 
 ```ts
-type: ["stereographic", "mercator", 0.7]
+type: ["general-perspective", "mercator", 0.7]
 ```
 
 #### Use a projection preset
@@ -220,4 +220,4 @@ There are also additional presets that yield commonly used expressions:
 
 | Preset | Full value | Description |
 |--------|------------|-------------|
-| `globe` | `["interpolate-projection", ["linear"], ["zoom"],`<br>`0, "stereographic", 10, "stereographic", 12, "mercator"]` | Adaptive globe: interpolates from stereographic to mercator projection between zoom levels 10 and 12. |
+| `globe` | `["interpolate-projection", ["linear"], ["zoom"],`<br>`0, "general-perspective", 10, "general-perspective", 12, "mercator"]` | Adaptive globe: interpolates from general-perspective to mercator projection between zoom levels 10 and 12. |

src/diff.test.ts

@@ -606,10 +606,10 @@ describe('diff', () => {
         expect(diffStyles({
         } as StyleSpecification,
         {
-            projection: {type: ['stereographic', 'mercator', 0.5]}
+            projection: {type: ['general-perspective', 'mercator', 0.5]}
 
         } as StyleSpecification)).toEqual([
-            {command: 'setProjection', args: [{type: ['stereographic', 'mercator', 0.5]}]},
+            {command: 'setProjection', args: [{type: ['general-perspective', 'mercator', 0.5]}]},
         ]);
     });
 });

src/reference/v8.json

@@ -3076,6 +3076,7 @@
         "group": "Ramps, scales, curves",
         "sdk-support": {
           "basic functionality": {
+            "js": "5.0.0"
           }
         }
       },
@@ -4606,13 +4607,13 @@
           "mercator": {
             "doc": "Web Mercator projection."
           },
-          "stereographic": {
-            "doc": "Stereographic projection."
+          "general-perspective": {
+            "doc": "General Perspective projection."
           }
         },
         "presets": {
           "globe": {
-            "doc": "Globe projection with zoom transition from Stereographic projection to Web Mercator projection."
+            "doc": "Globe projection with zoom transition from General Perspective projection to Web Mercator projection."
           }
         }
       },

src/util/interpolate.test.ts

@@ -119,9 +119,9 @@ describe('interpolate', () => {
     });
 
     test('interpolate projection', () => {
-        const i11nFn = (t: number) => interpolate.projection('stereographic', 'mercator', t);
+        const i11nFn = (t: number) => interpolate.projection('general-perspective', 'mercator', t);
         expect(i11nFn(0.5)).toBeInstanceOf(Projection);
-        expect(`${i11nFn(0.5)}`).toBe('["stereographic", "mercator", 0.5]');
+        expect(`${i11nFn(0.5)}`).toBe('["general-perspective", "mercator", 0.5]');
     });
 
     describe('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', 'stereographic', 1)}`).toBe('["mercator", "stereographic", 1]');
-        expect(`${new Projection('stereographic', 'mercator', 0.3)}`).toBe('["stereographic", "mercator", 0.3]');
+        expect(`${new Projection('mercator', 'general-perspective', 1)}`).toBe('["mercator", "general-perspective", 1]');
+        expect(`${new Projection('general-perspective', 'mercator', 0.3)}`).toBe('["general-perspective", "mercator", 0.3]');
     });
 });

src/validate/validate_projectionconfig.test.ts

@@ -33,7 +33,7 @@ describe('Validate projection', () => {
         expect(errors).toHaveLength(0);
         errors = validateProjectionConfig({validateSpec, value: {'type': 'mercator'}, styleSpec: v8, style: {} as any});
         expect(errors).toHaveLength(0);
-        errors = validateProjectionConfig({validateSpec, value: {'type': ['interpolate-projection', ['linear'], ['zoom'], 0, 'mercator', 5, 'stereographic']}, styleSpec: v8, style: {} as any});
+        errors = validateProjectionConfig({validateSpec, value: {'type': ['interpolate-projection', ['linear'], ['zoom'], 0, 'mercator', 5, 'general-perspective']}, styleSpec: v8, style: {} as any});
         expect(errors).toHaveLength(0);
     });