Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add EqualEarth, NaturalEarth and Lambert projections #11091

Merged
merged 4 commits into from
Oct 6, 2021

Conversation

ryanhamley
Copy link
Contributor

Launch Checklist

  • briefly describe the changes in this PR
    • adds Equal Earth, Natural Earth and Lambert Conformal Conical projections
    • renames WGS84 to Equirectangular
  • include before/after visuals or gifs if this PR includes visual changes
  • document any changes to public APIs
  • manually test the debug page

Equal Earth
equalearth

Natural Earth
naturalearth

Lambert isn't quite right but I'm not sure exactly how to fix it. It's based on the Conic Conformal projection from d3-geo. Suggestions are welcome.
Screen Shot 2021-10-05 at 6 56 15 PM
Screen Shot 2021-10-05 at 6 56 41 PM

@mourner
Copy link
Member

mourner commented Oct 6, 2021

@ryanhamley for Lambert, looks like the y coordinate is flipped somewhere? Classic LCC "centers" around the North pole while on the screenshot it's the South one.

Copy link
Member

@mourner mourner left a comment

Choose a reason for hiding this comment

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

Lambert should be good now!

@@ -90,20 +90,20 @@
albers: 3,
equalEarth: 1.0,
equirectangular: 1.0,
lambert: 1.0,
lambertConicConformal: 1.0,
Copy link
Member

Choose a reason for hiding this comment

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

Perhaps swap to lambertConformalConic? It seems like this is a more common order in the name (i.e. Wikipedia, GIS products etc.).

@ryanhamley ryanhamley merged commit a71116b into projections Oct 6, 2021
@ryanhamley ryanhamley deleted the projections-expand-support branch October 6, 2021 19:31
ansis added a commit that referenced this pull request Oct 19, 2021
* 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants