-
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.
- Loading branch information
Showing
424 changed files
with
9,360 additions
and
4,620 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
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 |
|---|---|---|
| @@ -1,6 +1,5 @@ | ||
| { | ||
| "parserOptions": { | ||
| "sourceType": "module", | ||
| "ecmaFeatures": { | ||
| "jsx": true | ||
| } | ||
|
|
||
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 |
|---|---|---|
| @@ -1,133 +1,44 @@ | ||
| // @flow | ||
|
|
||
| import Benchmark from '../lib/benchmark'; | ||
|
|
||
| import createStyle from '../lib/create_style'; | ||
| import VT from '@mapbox/vector-tile'; | ||
| import Protobuf from 'pbf'; | ||
| import assert from 'assert'; | ||
| import promisify from 'pify'; | ||
| import WorkerTile from '../../src/source/worker_tile'; | ||
| import StyleLayerIndex from '../../src/style/style_layer_index'; | ||
| import deref from '../../src/style-spec/deref'; | ||
| import fetchStyle from '../lib/fetch_style'; | ||
| import TileParser from '../lib/tile_parser'; | ||
| import { OverscaledTileID } from '../../src/source/tile_id'; | ||
| import { normalizeStyleURL, normalizeSourceURL, normalizeTileURL } from '../../src/util/mapbox'; | ||
|
|
||
| import type {TileJSON} from '../../src/types/tilejson'; | ||
|
|
||
| // Note: this class is extended in turn by the LayoutDDS benchmark. | ||
| export default class Layout extends Benchmark { | ||
| glyphs: Object; | ||
| icons: Object; | ||
| workerTile: WorkerTile; | ||
| layerIndex: StyleLayerIndex; | ||
| tiles: Array<{tileID: OverscaledTileID, buffer: ArrayBuffer}>; | ||
| parser: TileParser; | ||
|
|
||
| tileIDs(): Array<OverscaledTileID> { | ||
| return [ | ||
| setup(): Promise<void> { | ||
| const tileIDs = [ | ||
| new OverscaledTileID(12, 0, 12, 655, 1583), | ||
| new OverscaledTileID(8, 0, 8, 40, 98), | ||
| new OverscaledTileID(4, 0, 4, 3, 6), | ||
| new OverscaledTileID(0, 0, 0, 0, 0) | ||
| ]; | ||
| } | ||
|
|
||
| sourceID(): string { | ||
| return 'composite'; | ||
| } | ||
|
|
||
| fetchStyle(): Promise<StyleSpecification> { | ||
| return fetch(normalizeStyleURL(`mapbox://styles/mapbox/streets-v9`)) | ||
| .then(response => response.json()); | ||
| } | ||
|
|
||
| fetchTiles(styleJSON: StyleSpecification): Promise<Array<{tileID: OverscaledTileID, buffer: ArrayBuffer}>> { | ||
| const sourceURL: string = (styleJSON.sources[this.sourceID()]: any).url; | ||
| return fetch(normalizeSourceURL(sourceURL)) | ||
| .then(response => response.json()) | ||
| .then((tileJSON: TileJSON) => { | ||
| return Promise.all(this.tileIDs().map(tileID => { | ||
| return fetch((normalizeTileURL(tileID.canonical.url(tileJSON.tiles)))) | ||
| .then(response => response.arrayBuffer()) | ||
| .then(buffer => ({tileID, buffer})); | ||
| })); | ||
| }); | ||
| } | ||
|
|
||
| setup(): Promise<void> { | ||
| return this.fetchStyle() | ||
| return fetchStyle(`mapbox://styles/mapbox/streets-v9`) | ||
| .then((styleJSON) => { | ||
| this.layerIndex = new StyleLayerIndex(deref(styleJSON.layers)); | ||
| return Promise.all([createStyle(styleJSON), this.fetchTiles(styleJSON)]); | ||
| this.parser = new TileParser(styleJSON, 'composite'); | ||
| return this.parser.setup(); | ||
| }) | ||
| .then(([style, tiles]) => { | ||
| .then(() => { | ||
| return Promise.all(tileIDs.map(tileID => this.parser.fetchTile(tileID))); | ||
| }) | ||
| .then((tiles) => { | ||
| this.tiles = tiles; | ||
| this.glyphs = {}; | ||
| this.icons = {}; | ||
|
|
||
| const preloadGlyphs = (params, callback) => { | ||
| style.getGlyphs('', params, (err, glyphs) => { | ||
| this.glyphs[JSON.stringify(params)] = glyphs; | ||
| callback(err, glyphs); | ||
| }); | ||
| }; | ||
|
|
||
| const preloadImages = (params, callback) => { | ||
| style.getImages('', params, (err, icons) => { | ||
| this.icons[JSON.stringify(params)] = icons; | ||
| callback(err, icons); | ||
| }); | ||
| }; | ||
|
|
||
| return this.bench(preloadGlyphs, preloadImages); | ||
| }); | ||
| // parse tiles once to populate glyph/icon cache | ||
| return Promise.all(tiles.map(tile => this.parser.parseTile(tile))); | ||
| }) | ||
| .then(() => {}); | ||
| } | ||
|
|
||
| bench(getGlyphs: Function = (params, callback) => callback(null, this.glyphs[JSON.stringify(params)]), | ||
| getImages: Function = (params, callback) => callback(null, this.icons[JSON.stringify(params)])) { | ||
|
|
||
| const actor = { | ||
| send(action, params, callback) { | ||
| setTimeout(() => { | ||
| if (action === 'getImages') { | ||
| getImages(params, callback); | ||
| } else if (action === 'getGlyphs') { | ||
| getGlyphs(params, callback); | ||
| } else assert(false); | ||
| }, 0); | ||
| } | ||
| }; | ||
|
|
||
| let promise: Promise<void> = Promise.resolve(); | ||
|
|
||
| for (const {tileID, buffer} of this.tiles) { | ||
| bench() { | ||
| let promise = Promise.resolve(); | ||
| for (const tile of this.tiles) { | ||
| promise = promise.then(() => { | ||
| const workerTile = new WorkerTile({ | ||
| tileID: tileID, | ||
| zoom: tileID.overscaledZ, | ||
| tileSize: 512, | ||
| overscaling: 1, | ||
| showCollisionBoxes: false, | ||
| source: this.sourceID(), | ||
| uid: '0', | ||
| maxZoom: 22, | ||
| pixelRatio: 1, | ||
| request: { | ||
| url: '' | ||
| }, | ||
| angle: 0, | ||
| pitch: 0, | ||
| cameraToCenterDistance: 0, | ||
| cameraToTileDistance: 0 | ||
| }); | ||
|
|
||
| const tile = new VT.VectorTile(new Protobuf(buffer)); | ||
| const parse = promisify(workerTile.parse.bind(workerTile)); | ||
|
|
||
| return parse(tile, this.layerIndex, actor); | ||
| return this.parser.parseTile(tile).then(() => {}); | ||
| }); | ||
| } | ||
|
|
||
| return promise; | ||
| } | ||
| } |
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
Oops, something went wrong.