-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'publisher-production' into docs-redesign
* publisher-production: (115 commits) fix inter-documentation link (#7791) [docs] use docs subdomain in examples (#7789) Bump Publisher First shot at new-domain staging [docs] Update page shell (#7760) updates API docs links to new url structure (#7757) add mapbox-gl-utils to plugins (#7752) [docs] Use docs-page-shell (#7742) Fixes bugs in documentation (#7741) Add worldviews example (#7720) Update compatibility matrix for `fill-extrusion-vertical-gradient` for ios & macos. (#7712) updates mapbox-gl-directions version in example (#7719) v0.52.0 cherry-pick color state fix to release branch (#7715) Update location of drone video used in examples. v0.52.0-beta.2 Cache hillshade textures based on texture size, not tile size. (#7695) avoid incomplete webp support in Edge 18 (#7687) (#7692) only align raster sources to pixel grid when map is idle to prevent shaking (#7426) (#7694) Flattens nested single element all expressions when converting to expressions (#7679) ...
- Loading branch information
Katy DeCorah
committed
Jan 23, 2019
1 parent
983fb4d
commit bca1d4f
Showing
245 changed files
with
5,776 additions
and
3,582 deletions.
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,4 +17,4 @@ | |
| .*/_site/.* | ||
|
|
||
| [version] | ||
| 0.77.0 | ||
| 0.85.0 | ||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| subdomain: docs |
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
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
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| // @flow | ||
|
|
||
| import Layout from './layout'; | ||
| import SymbolBucket from '../../src/data/bucket/symbol_bucket'; | ||
| import { performSymbolLayout } from '../../src/symbol/symbol_layout'; | ||
| import { OverscaledTileID } from '../../src/source/tile_id'; | ||
|
|
||
| export default class SymbolLayout extends Layout { | ||
| parsedTiles: Array<any>; | ||
|
|
||
| constructor(style: string, locations: ?Array<OverscaledTileID>) { | ||
| super(style, locations); | ||
| this.parsedTiles = []; | ||
| } | ||
|
|
||
| setup(): Promise<void> { | ||
| return super.setup().then(() => { | ||
| // Do initial load/parse of tiles and hold onto all the glyph/icon | ||
| // dependencies so that we can re-do symbol layout in isolation | ||
| // during the bench step. | ||
| return Promise.all(this.tiles.map(tile => | ||
| this.parser.parseTile(tile, true).then((tileResult) => { | ||
| this.parsedTiles.push(tileResult); | ||
| }) | ||
| )).then(() => {}); | ||
| }); | ||
| } | ||
|
|
||
| bench() { | ||
| let promise = Promise.resolve(); | ||
| for (const tileResult of this.parsedTiles) { | ||
| promise = promise.then(() => { | ||
| for (const bucket of tileResult.buckets) { | ||
| if (bucket instanceof SymbolBucket) { | ||
| performSymbolLayout(bucket, | ||
| tileResult.glyphMap, | ||
| tileResult.glyphPositions, | ||
| tileResult.iconMap, | ||
| tileResult.imageAtlas.iconPositions, | ||
| false); | ||
| } | ||
| } | ||
| }); | ||
| } | ||
| return promise; | ||
| } | ||
| } |
Oops, something went wrong.