Match GlobeView projection parameters with Maplibre v5 #9201

Pessimistress · 2024-10-04T05:13:56Z

For #9199

Grid lines are rendered by Maplibre, points are rendered by deck.gl.

Change List

Match GlobeViewport's scale, nearZ, farZ with maplibre's GlobeTransform
GlobeView switch to WebMercatorViewport at zoom>=12. maplibre performs interpolation between the two projections at z [11, 12]. We may need to do the same, but the difference is honestly very subtle.
Some golden images are updated because the zoom -> scale mapping has changed. The new implementation uses an adaptive scale that depends on the latitude of the viewport center.

felixpalmer

Looks promising, but I get the page freezing after playing with the controls when viewing the full globe

modules/core/src/controllers/globe-controller.ts

felixpalmer · 2024-10-04T08:41:15Z

modules/core/src/controllers/globe-controller.ts

@@ -9,6 +9,9 @@ import {MapState, MapStateProps} from './map-controller';
 import {mod} from '../utils/math-utils';
 import LinearInterpolator from '../transitions/linear-interpolator';

+// matches Web Mercator projection limit
+const MAX_VALID_LATITUDE = 85.051129;
+


I'm seeing strange things when moving near the poles

Screen.Recording.2024-10-04.at.10.40.03.mov

modules/core/src/viewports/globe-viewport.ts

test/modules/geo-layers/tileset-2d/utils.spec.ts

modules/core/src/viewports/globe-viewport.ts

chrisgervang · 2024-11-22T20:17:21Z

test/render/test-cases/views.js

-        zoom: 0,
-        pitch: 0,
-        bearing: 0
+        zoom: -1


What's a negative zoom mean for globe?

chrisgervang · 2024-11-22T20:18:17Z

modules/core/src/viewports/globe-viewport.ts

@@ -50,6 +51,8 @@ export type GlobeViewportOptions = {
  zoom?: number;


Worth adding a comment about zoom's range in a globe view?

ibgreen

This looks quite clean, I don't see any immediate reason why we wouldn't want to merge this as experimental in 9.1.

modules/core/src/controllers/globe-controller.ts

ibgreen · 2024-11-25T15:17:49Z

modules/core/src/controllers/globe-controller.ts

@@ -20,7 +23,7 @@ class GlobeState extends MapState {
    if (longitude < -180 || longitude > 180) {
      props.longitude = mod(longitude + 180, 360) - 180;
    }
-    props.latitude = clamp(latitude, -89, 89);
+    props.latitude = clamp(latitude, -MAX_VALID_LATITUDE, MAX_VALID_LATITUDE);


Can we go all the way? or do we need some offset to avoid issues?

If we let latitude=90 then the controller goes into gimbal lock. It is a solvable problem, but irrelevant to this PR.

ibgreen · 2024-11-25T15:22:27Z

modules/core/src/viewports/globe-viewport.ts

      resolution = 10
    } = opts;

-    let {height, altitude = 1.5} = opts;
+    let {height, altitude = 1.5, fovy} = opts;


Nit: FWIW, I have consistently been adding a defaultOptions object to classes in luma.gl so that I can document all default options in one place rather than spreading out the default values in a bunch of descructuring calls like this.

static defaultOptions: Required<GlobeViewportOptions> = { ... }; this.options ={...GlobeViewport.defaultOptions, ...options};

modules/core/src/viewports/globe-viewport.ts

ibgreen · 2024-11-25T15:59:41Z

modules/core/src/views/globe-view.ts

@@ -37,8 +38,8 @@ export default class GlobeView extends View<GlobeViewState, GlobeViewProps> {
    super(props);
  }

-  get ViewportType() {
-    return GlobeViewport;
+  getViewportType(viewState: GlobeViewState) {


Nit: It just seems a bit weird that one of these takes an argument and the others do not. Should we allow it to be omitted?

Not sure if making the types less restrictive could be useful? - i.e. only ask for what we need to answer the question

Suggested change

getViewportType(viewState: GlobeViewState) {

getViewportType(viewState: {zoom: number}) {

test/modules/geo-layers/tileset-2d/utils.spec.ts

ibgreen · 2024-11-25T16:05:26Z

modules/core/src/viewports/globe-viewport.ts


    height = height || 1;
-    altitude = Math.max(0.75, altitude);
+    if (fovy) {


This aligns us more with other views, right?
We always support fovy and altitude is a backup for geospatial views?

That is correct.
altitude is a parameter we inherited from the mapbox/maplibre. The name is a bit misleading. It refers to the camera's distance to the sea plane.

modules/core/src/viewports/globe-viewport.ts

felixpalmer

@Pessimistress I believe the page freeze is unrelated to this PR #9265

coveralls · 2024-12-11T18:03:26Z

coverage: 91.702% (-0.003%) from 91.705%
when pulling 2f8996f on x/globe-view
into 0a4a25a on master.

Pessimistress requested review from felixpalmer and ibgreen October 4, 2024 05:13

felixpalmer requested changes Oct 4, 2024

View reviewed changes

birkskyum mentioned this pull request Nov 2, 2024

Rename adaptive globe to globe-to-mercator maplibre/maplibre-style-spec#878

Merged

1 task

chrisgervang reviewed Nov 22, 2024

View reviewed changes

test/render/test-cases/views.js

zoom: 0,

pitch: 0,

bearing: 0

zoom: -1

Copy link

Collaborator

chrisgervang Nov 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's a negative zoom mean for globe?

chrisgervang reviewed Nov 22, 2024

View reviewed changes

ibgreen approved these changes Nov 25, 2024

View reviewed changes

felixpalmer approved these changes Nov 26, 2024

View reviewed changes

felixpalmer mentioned this pull request Dec 4, 2024

Tracker: v9.1 #9056

Closed

45 tasks

Pessimistress added 5 commits December 11, 2024 09:24

projection test app

192dde6

align globe projection with maplibre

cf6e3ba

Update golden images

848257d

fix unit test

fe7c006

address comments

2f8996f

Pessimistress force-pushed the x/globe-view branch from 3fe3bc3 to 2f8996f Compare December 11, 2024 17:55

Pessimistress changed the base branch from x/globe-test-app to master December 11, 2024 17:55

Pessimistress merged commit e9eada6 into master Dec 11, 2024
4 checks passed

Pessimistress deleted the x/globe-view branch December 11, 2024 18:47

felixpalmer mentioned this pull request Dec 13, 2024

website: Maplibre globe example #9293

Merged

chrisgervang mentioned this pull request Jan 17, 2025

chore: projection test app #9200

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Match GlobeView projection parameters with Maplibre v5 #9201

Match GlobeView projection parameters with Maplibre v5 #9201

Pessimistress commented Oct 4, 2024

felixpalmer left a comment

felixpalmer Oct 4, 2024

chrisgervang Nov 22, 2024

chrisgervang Nov 22, 2024

ibgreen left a comment

ibgreen Nov 25, 2024

Pessimistress Dec 11, 2024 •

edited

Loading

ibgreen Nov 25, 2024

ibgreen Nov 25, 2024

ibgreen Nov 25, 2024

Pessimistress Dec 11, 2024

felixpalmer left a comment

coveralls commented Dec 11, 2024

		@@ -50,6 +51,8 @@ export type GlobeViewportOptions = {
		zoom?: number;

	getViewportType(viewState: GlobeViewState) {
	getViewportType(viewState: {zoom: number}) {

Match GlobeView projection parameters with Maplibre v5 #9201

Match GlobeView projection parameters with Maplibre v5 #9201

Conversation

Pessimistress commented Oct 4, 2024

Change List

felixpalmer left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ibgreen left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Pessimistress Dec 11, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

felixpalmer left a comment

Choose a reason for hiding this comment

coveralls commented Dec 11, 2024

Pessimistress Dec 11, 2024 •

edited

Loading