From 1eab57d1cd20f5562ac1ff5cb5182401a07ad0a9 Mon Sep 17 00:00:00 2001 From: Anjana Vakil Date: Tue, 12 Nov 2019 17:31:55 -0800 Subject: [PATCH] Revert changes to how styleBenchmarkLocations is imported from gazetteer --- bench/styles/benchmarks.js | 4 ++-- bench/versions/benchmarks.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bench/styles/benchmarks.js b/bench/styles/benchmarks.js index d537bf05979..aa9fd3aadcd 100644 --- a/bench/styles/benchmarks.js +++ b/bench/styles/benchmarks.js @@ -1,7 +1,7 @@ import mapboxgl from '../../src'; import accessToken from '../lib/access_token'; import locationsWithTileID from '../lib/locations_with_tile_id'; -import {benchmark} from '@mapbox/gazetteer'; +import styleBenchmarkLocations from '@mapbox/gazetteer/mapbox-streets/style-benchmark-locations.json'; import StyleLayerCreate from '../benchmarks/style_layer_create'; import Validate from '../benchmarks/style_validate'; import Layout from '../benchmarks/layout'; @@ -11,7 +11,7 @@ import QueryBox from '../benchmarks/query_box'; import getWorkerPool from '../../src/util/global_worker_pool'; -const locations = locationsWithTileID(benchmark.styleBenchmarkLocations.features); +const locations = locationsWithTileID(styleBenchmarkLocations.features); mapboxgl.accessToken = accessToken; diff --git a/bench/versions/benchmarks.js b/bench/versions/benchmarks.js index e5d103a9d4a..f3f2e06f47a 100644 --- a/bench/versions/benchmarks.js +++ b/bench/versions/benchmarks.js @@ -1,7 +1,7 @@ import mapboxgl from '../../src'; import accessToken from '../lib/access_token'; import locationsWithTileID from '../lib/locations_with_tile_id'; -import {benchmark} from '@mapbox/gazetteer'; +import styleBenchmarkLocations from '@mapbox/gazetteer/mapbox-streets/style-benchmark-locations.json'; import Layout from '../benchmarks/layout'; import LayoutDDS from '../benchmarks/layout_dds'; import SymbolLayout from '../benchmarks/symbol_layout'; @@ -21,7 +21,7 @@ import FilterEvaluate from '../benchmarks/filter_evaluate'; import getWorkerPool from '../../src/util/global_worker_pool'; -const styleLocations = locationsWithTileID(benchmark.styleBenchmarkLocations.features); +const styleLocations = locationsWithTileID(styleBenchmarkLocations.features); mapboxgl.accessToken = accessToken;