Adds support for mapzen terrain #6110
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 tasks
|
Looks great! You guys have such a nice project structure. Great work! |
|
@ibesora here is the gl-native equivalent mapbox/mapbox-gl-native#11154 |
anandthakker
approved these changes
Feb 12, 2018
src/data/dem_data.js
Outdated
| @@ -57,22 +57,14 @@ class DEMData { | |||
| this.loaded = !!data; | |||
| } | |||
|
|
|||
| loadFromImage(data: RGBAImage) { | |||
| loadFromImage(data: RGBAImage, encoding?: "mapbox" | "terrarium") { | |||
There was a problem hiding this comment.
encoding can be non-optional here
| @@ -21,11 +21,12 @@ class RasterDEMTileWorkerSource { | |||
| } | |||
|
|
|||
| loadTile(params: WorkerDEMTileParameters, callback: WorkerDEMTileCallback) { | |||
| const uid = params.uid; | |||
| const uid = params.uid, | |||
| encoding = params.encoding || "mapbox"; | |||
There was a problem hiding this comment.
the || "mapbox" shouldn't be needed since WorkerDemTileParameters.encoding is required.
pathmapper
pushed a commit
to pathmapper/mapbox-gl-js
that referenced
this pull request
Feb 13, 2018
* Added the encoding parameter to the raster-dem source type * Changes proposed by @mollymerp * Changed the raster-dem description and expanded the encoding parameter one * Changed the description in the style spec reference * Fixes linter errors * Changed ts type * Proposed changes * Bug * Added a default value when the RasterDEMTileWorkerSource is called without params * Adds default value to pass unit tests * Explicit encoding type and _ to private functions * add guard for invalid encoding parameter and unit test * add terrarium render test * address review comments
pathmapper
pushed a commit
to pathmapper/mapbox-gl-js
that referenced
this pull request
Feb 13, 2018
* Added the encoding parameter to the raster-dem source type * Changes proposed by @mollymerp * Changed the raster-dem description and expanded the encoding parameter one * Changed the description in the style spec reference * Fixes linter errors * Changed ts type * Proposed changes * Bug * Added a default value when the RasterDEMTileWorkerSource is called without params * Adds default value to pass unit tests * Explicit encoding type and _ to private functions * add guard for invalid encoding parameter and unit test * add terrarium render test * address review comments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
continuing from @ibesora's work at #6024
@ibesora I rebased your PR and fixed the merge conflicts, and then I added a couple comments and tests 😊 . I don't have push access to your branch, so I made this new one (as I did with the maxzoom PR)