Make globe a spherical projection

Author: birkskyum

CHANGELOG.md

@@ -1,8 +1,6 @@
 ## main
 
 ### ✨ Features and improvements
-- Rename adaptive globe from `globe` to `globe-to-mercator` ([#878](https://github.com/maplibre/maplibre-style-spec/pull/878))
-- Add non-adaptive `globe` ([#878](https://github.com/maplibre/maplibre-style-spec/pull/878))
 - _...Add new stuff here..._
 
 ### 🐞 Bug fixes

src/diff.test.ts

@@ -607,10 +607,10 @@ describe('diff', () => {
         } as StyleSpecification,
         {
             projection: {
-                type: 'globe-to-mercator'
+                type: 'globe'
             }
         } as StyleSpecification)).toEqual([
-            {command: 'setProjection', args: [{type: 'globe-to-mercator'}]},
+            {command: 'setProjection', args: [{type: 'globe'}]},
         ]);
     });
 });

src/reference/v8.json

@@ -129,7 +129,7 @@
       "type": "projection",
       "doc": "The projection configuration. **Note:** this definition is still experimental and is under development in maplibre-gl-js.",
       "example": {
-        "type": "globe-to-mercator"
+        "type": "mercator"
       }
     },
     "terrain": {
@@ -4538,7 +4538,7 @@
         ]
       },
       "transition": true,
-      "doc": "How to blend the atmosphere. Where 1 is visible atmosphere and 0 is hidden. It is best to interpolate this expression when using globe-to-mercator projection."
+      "doc": "How to blend the atmosphere. Where 1 is visible atmosphere and 0 is hidden. It is best to interpolate this expression when using globe projection."
     }
   },
   "terrain": {
@@ -4579,9 +4579,6 @@
         },
         "globe": {
           "doc":  "Spherical projection."
-        },
-        "globe-to-mercator": {
-          "doc":  "Spherical projection with zoom transition to Web Mercator projection."
         }
       }
     }

src/validate/validate_projection.test.ts

@@ -26,11 +26,11 @@ describe('Validate projection', () => {
     test('Should return errors according to spec violations', () => {
         const errors = validateProjection({validateSpec, value: {type: 1 as any}, styleSpec: v8, style: {} as any});
         expect(errors).toHaveLength(1);
-        expect(errors[0].message).toBe('type: expected one of [mercator, globe, globe-to-mercator], 1 found');
+        expect(errors[0].message).toBe('type: expected one of [mercator, globe], 1 found');
     });
 
     test('Should pass if everything is according to spec', () => {
-        let errors = validateProjection({validateSpec, value: {type: 'globe-to-mercator'}, styleSpec: v8, style: {} as any});
+        let errors = validateProjection({validateSpec, value: {type: 'globe'}, styleSpec: v8, style: {} as any});
         expect(errors).toHaveLength(0);
         errors = validateProjection({validateSpec, value: {type: 'mercator'}, styleSpec: v8, style: {} as any});
         expect(errors).toHaveLength(0);