fix pitch, line-width and other properties for projections #11080

ansis · 2021-10-04T15:03:26Z

This fixes various things when an alternate projection is set:

pitching (previously the center of the map would move as you pitch)
line-width and other line properties
map-aligned symbols (one-way arrows)
map-aligned circles
fill-extrusions (which were previously way too tall)

The undistortion is applied relative to the center, instead of relative to the camera (translate center to origin, undistort, translate back). The undistortion block is also now completely bypassed for mercator.

The style-spec property sizes are fixed by replacing pixelsToTileUnits with a 2x2 matrix that accounts for the shearing and scaling. There may be a couple more spots we need to make this change but I addressed all the major places this matters.

This also fixes support for multiple maps on a single page and optimizes geometry loading by avoiding tileTransform recalculations.

Before/After/Reference images

Pitching

Previously, the center was wrong.

mercator (reference):

new:

old:

Style spec property sizes

Compare the line widths and the skewness of the one-way arrows.

mercator (reference):

new:

old:

(one way arrows)

mourner

Apart from the matrix caching comment, this looks great!

src/geo/transform.js

and remove global projection object to allow multiple maps on a single page.

mourner

Looks great now apart from the two runtime-styling render test failures — one consistently times out and another fails some assertion.

ryanhamley

Apart from the failing render tests, this looks great

render test fixed

* rough projection support * projections stencil clipping and refactor (#410) * Enable stencil clipping for line and fill layers * Use buffers from tile * Refactor tile bounds buffers * Rename things to not exclusively be RasterBounds * Create projections directory * More refactoring * Combine matrix calculations * Cleanup * Refactor projections to new folder * Begin debug work * Tile boundaries are working * Refactor indexbuffer and segmentvector to per painter * merge projectx and projecty functions * nits Co-authored-by: Ansis Brammanis <ansis@mapbox.com> * Projections fix location issues (#414) * Add debug page * Add projection option * Wire up projection code with worker * Rename projections folder to projection * Refactor and update free camera * Add Projection type and fix center calculations * Fix bug with transform._center * Make Winkel projection noop for now * Update demo HTML and CSS * temp remove undistortion Co-authored-by: Ansis Brammanis <ansis@mapbox.com> * [projections] Adaptive geometry resampling for alternative projections (#10753) * implement adaptive resampling of reprojected geometry * address feedback * Refactor projections code to get all tests passing (#10732) * [projections] Simplify and optimize tile transform code (#10780) * simplify projections tile transform * skip resampling for mercator * [projections] Fix performance regression in draw_background (#10747) * separate tiles for background layers * additional lint & flow fixes * try fixing tests * try fixing render tests Co-authored-by: Ansis Brammanis <ansis@mapbox.com> * Pin chrome to version 91 (#10887) (#10896) * Pin to chrome version 91 * Pin chrome version for test-browser Co-authored-by: Arindam Bose <arindam.bose@mapbox.com> * Refactor raw projections, handle projection options (#10913) * refactor raw projections, handle projection options * add unprojection to winkel tripel * fix flow * Pin chrome to version 91 (#10887) * Pin to chrome version 91 * Pin chrome version for test-browser * fix lint * remove to superfluous sin calls Co-authored-by: Arindam Bose <arindam.bose@mapbox.com> * Fix bearing for non-mercator projections (#10781) * Use adaptive resampling with MARTINI & Earcut for non-Mercator tiles (#10980) * use adaptive resampling and earcut for non-Mercator tile bounds * fix unit test * use adaptive MARTINI mesh for non-Mercator raster tiles * Clamp unproject to valid geo range in alternate projections (#10992) * clamp unproject to mercator bounds in all projections * fix marker test * avoid wrapping center for non-Mercator projections * extend alt projections clamping to full lat range * correct zoom, bearing and shear for projections (#10976) * fix zoom, bearing and skew for projections * refactor adjustments * lint * add comments * Fix circle and heatmap on alternate projections (#11074) * fix circle & heatmap on alternate projections (blunder) * fix unit test * fix pitch, line-width and other properties for projections (#11080) and: - fix fill-extrusions - remove global projection variable to allow multiple maps on one page - avoid recalculating tileTransform * Add Equal Earth, Natural Earth and Lambert Conformal Conic projections (#11091) * Fix constraining logic for alternate projections (#11092) * adaptive bbox for projections, refactor resampling * better precision for adaptive bounds * remove leftover * fix zoom/shear adjustments near poles * optimize tile transform * fix lint * attempt to fix tests * simplify, clarify and consolidate constraining logic * minor renames in transform * safer clamping for zoom adjustments * Projections public API (#11002) Co-authored-by: Ansis Brammanis <ansis@mapbox.com> * fix conflicts * fix seams around alternate-projected tiles (#11119) * fix unit tests * remove alaska * Basic support for custom maxBounds in alternate projections (#11121) * rudimentary support for custom maxBounds in alternate projections * fix flow * fix image and video sources in alternate projections (#11123) * clean up debug pages * remove uncessary deg <--> rad conversions * fix filename casing * fix queryRenderedFeatures for alternate projections (#11125) * Projections fixups (#11127) * disable terrain and fog for alternate projections (#11126) * Lazily instantiate projected tile debug buffers and release projected buffers when tiles are unloaded (#11128) * enable lod tile loading for projections (#11129) * enable lod tile loading for projections to significantly reduce the number of tiles at low zoom levels * use Math.hypot(...) Co-authored-by: Vladimir Agafonkin <agafonkin@gmail.com> * add comments Co-authored-by: Vladimir Agafonkin <agafonkin@gmail.com> * allow map.setProjection(null) * add limitations * avoid recreating tile buffer Co-authored-by: Karim Naaji <karim.naaji@gmail.com> * fix assertion error * fix requires * center projections vertically Center projections vertically in 0 to 1 range. This shouldn't matter but there is some constraining behavior that is currently affected by this. * Fix tile buffer destroyed but not reset (#11134) * mention settin bounds in projection docs Co-authored-by: Ryan Hamley <ryan.hamley@mapbox.com> Co-authored-by: Vladimir Agafonkin <agafonkin@gmail.com> Co-authored-by: Arindam Bose <arindam.bose@mapbox.com> Co-authored-by: Karim Naaji <karim.naaji@gmail.com>

ansis added 5 commits October 3, 2021 20:11

fix pitch and line width

0e48a9d

fix all line shaders

0d16baf

cache pixelsToTileUnits matrix

7f8a4ef

fix map-aligned symbols

67bd05e

(one way arrows)

improve circles

aec7434

ansis requested review from mourner and ryanhamley October 4, 2021 15:03

mourner requested changes Oct 4, 2021

View reviewed changes

src/geo/transform.js Show resolved Hide resolved

ansis added 4 commits October 4, 2021 14:52

fix fill-extrusion height with projections

e6c005a

optimize tileTransform by storing it on tile

8f9beb2

and remove global projection object to allow multiple maps on a single page.

fixup

485209b

fix tests

4789dad

mourner previously requested changes Oct 5, 2021

View reviewed changes

ryanhamley approved these changes Oct 5, 2021

View reviewed changes

fix reloadTile

28302f3

ansis merged commit f42389d into projections Oct 5, 2021

ansis deleted the projections-fix-pitch branch October 5, 2021 19:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix pitch, line-width and other properties for projections #11080

fix pitch, line-width and other properties for projections #11080

ansis commented Oct 4, 2021 •

edited

Loading

mourner left a comment

mourner left a comment

ryanhamley left a comment •

edited

Loading

fix pitch, line-width and other properties for projections #11080

fix pitch, line-width and other properties for projections #11080

Conversation

ansis commented Oct 4, 2021 • edited Loading

Pitching

Style spec property sizes

mourner left a comment

Choose a reason for hiding this comment

mourner left a comment

Choose a reason for hiding this comment

ryanhamley left a comment • edited Loading

Choose a reason for hiding this comment

ansis commented Oct 4, 2021 •

edited

Loading

ryanhamley left a comment •

edited

Loading