Clean code

src/data/bucket.js

@@ -8,6 +8,7 @@ import type Context from '../gl/context';
 import type {FeatureStates} from '../source/source_state';
 import type {ImagePosition} from '../render/image_atlas';
 import type {CanonicalTileID} from '../source/tile_id';
+
 export type BucketParameters<Layer: TypedStyleLayer> = {
     index: number,
     layers: Array<Layer>,

src/data/bucket/circle_bucket.js

@@ -10,6 +10,7 @@ import loadGeometry from '../load_geometry';
 import EXTENT from '../extent';
 import {register} from '../../util/web_worker_transfer';
 import EvaluationParameters from '../../style/evaluation_parameters';
+
 import type {CanonicalTileID} from '../../source/tile_id';
 import type {
     Bucket,

src/data/bucket/fill_bucket.js

@@ -14,6 +14,7 @@ import {register} from '../../util/web_worker_transfer';
 import {hasPattern, addPatternDependencies} from './pattern_bucket_features';
 import loadGeometry from '../load_geometry';
 import EvaluationParameters from '../../style/evaluation_parameters';
+
 import type {CanonicalTileID} from '../../source/tile_id';
 import type {
     Bucket,

src/data/bucket/fill_extrusion_bucket.js

@@ -17,6 +17,7 @@ import {register} from '../../util/web_worker_transfer';
 import {hasPattern, addPatternDependencies} from './pattern_bucket_features';
 import loadGeometry from '../load_geometry';
 import EvaluationParameters from '../../style/evaluation_parameters';
+
 import type {CanonicalTileID} from '../../source/tile_id';
 import type {
     Bucket,

src/data/bucket/line_bucket.js

@@ -13,6 +13,7 @@ import {register} from '../../util/web_worker_transfer';
 import {hasPattern, addPatternDependencies} from './pattern_bucket_features';
 import loadGeometry from '../load_geometry';
 import EvaluationParameters from '../../style/evaluation_parameters';
+
 import type {CanonicalTileID} from '../../source/tile_id';
 import type {
     Bucket,

src/data/bucket/symbol_bucket.js

@@ -39,6 +39,7 @@ import EvaluationParameters from '../../style/evaluation_parameters';
 import Formatted from '../../style-spec/expression/types/formatted';
 import ResolvedImage from '../../style-spec/expression/types/resolved_image';
 import {plugin as globalRTLTextPlugin, getRTLTextPluginStatus} from '../../source/rtl_text_plugin';
+
 import type {CanonicalTileID} from '../../source/tile_id';
 import type {
     Bucket,

src/data/feature_index.js

@@ -180,8 +180,7 @@ class FeatureIndex {
         const sourceLayerName = this.sourceLayerCoder.decode(sourceLayerIndex);
         const sourceLayer = this.vtLayers[sourceLayerName];
         const feature = sourceLayer.feature(featureIndex);
-        const evaluationFeature = {type: feature.type, id: ('id' in feature ? feature.id : null), properties: feature.properties};
-        if (!filter(new EvaluationParameters(this.tileID.overscaledZ), evaluationFeature))
+        if (!filter(new EvaluationParameters(this.tileID.overscaledZ), feature))
             return;
 
         const id = this.getId(feature, sourceLayerName);

src/data/program_configuration.js

@@ -7,8 +7,8 @@ import {register} from '../util/web_worker_transfer';
 import {PossiblyEvaluatedPropertyValue} from '../style/properties';
 import {StructArrayLayout1f4, StructArrayLayout2f8, StructArrayLayout4f16, PatternLayoutArray} from './array_types';
 import {clamp} from '../util/util';
+
 import loadGeometry from './load_geometry';
-import type {CanonicalTileID} from '../source/tile_id';
 import EvaluationParameters from '../style/evaluation_parameters';
 import FeaturePositionMap from './feature_position_map';
 import {
@@ -19,6 +19,7 @@ import {
     type UniformLocations
 } from '../render/uniform_binding';
 
+import type {CanonicalTileID} from '../source/tile_id';
 import type Context from '../gl/context';
 import type {TypedStyleLayer} from '../style/style_layer/typed_style_layer';
 import type {CrossfadeParameters} from '../style/evaluation_parameters';

src/source/tile.js

@@ -12,6 +12,7 @@ import browser from '../util/browser';
 import EvaluationParameters from '../style/evaluation_parameters';
 import SourceFeatureState from '../source/source_state';
 import {lazyLoadRTLTextPlugin} from './rtl_text_plugin';
+
 const CLOCK_SKEW_RETRY_TIMEOUT = 30000;
 
 import type {Bucket} from '../data/bucket';

src/source/worker_tile.js

@@ -27,6 +27,7 @@ import type {
     WorkerTileCallback,
 } from '../source/worker_source';
 import type {PromoteIdSpecification} from '../style-spec/types';
+
 class WorkerTile {
     tileID: OverscaledTileID;
     uid: string;
@@ -65,6 +66,7 @@ class WorkerTile {
     parse(data: VectorTile, layerIndex: StyleLayerIndex, availableImages: Array<string>, actor: Actor, callback: WorkerTileCallback) {
         this.status = 'parsing';
         this.data = data;
+
         this.collisionBoxArray = new CollisionBoxArray();
         const sourceLayerCoder = new DictionaryCoder(Object.keys(data.layers).sort());
 
@@ -121,6 +123,7 @@ class WorkerTile {
                     sourceLayerIndex,
                     sourceID: this.source
                 });
+
                 bucket.populate(features, options, this.tileID.canonical);
                 featureIndex.bucketLayerIDs.push(family.map((l) => l.id));
             }

src/style-spec/expression/index.js

@@ -31,8 +31,8 @@ import type {CanonicalTileID} from '../../source/tile_id';
 export type Feature = {
     +type: 1 | 2 | 3 | 'Unknown' | 'Point' | 'MultiPoint' | 'LineString' | 'MultiLineString' | 'Polygon' | 'MultiPolygon',
     +id?: any,
-    +properties: {[string]: any},
-    +patterns?: {[string]: {"min": string, "mid": string, "max": string}},
+    +properties: {[_: string]: any},
+    +patterns?: {[_: string]: {"min": string, "mid": string, "max": string}},
     +geometry?: Array<Array<Point>>
 };
 

src/style-spec/expression/parsing_context.js

@@ -95,7 +95,6 @@ class ParsingContext {
             }
 
             const Expr = this.registry[op];
-
             if (Expr) {
                 let parsed = Expr.parse(expr, this);
                 if (!parsed) return null;

src/style-spec/reference/v8.json

@@ -3459,7 +3459,7 @@
         "group": "Decision",
         "sdk-support": {
           "basic functionality": {
-            "js": "1.6.0"
+            "js": "1.9.0"
           }
         }
       },

src/style/style.js

@@ -368,10 +368,8 @@ class Style extends Evented {
     }
 
     /**
- * Apply queued style updates in a batch and recalculate zoom-dependent paint properties.
- *
- * @param parameters
- */
+     * Apply queued style updates in a batch and recalculate zoom-dependent paint properties.
+     */
     update(parameters: EvaluationParameters) {
         if (!this._loaded) {
             return;
@@ -621,13 +619,10 @@ class Style extends Evented {
     }
 
     /**
- * Add a layer to the map style. The layer will be inserted before the layer with
-ID `before`, or appended if `before` is omitted.
- *
- * @param layerObject
- * @param {string} [before] ID of an existing layer to insert before
- * @param options
- */
+     * Add a layer to the map style. The layer will be inserted before the layer with
+     * ID `before`, or appended if `before` is omitted.
+     * @param {string} [before] ID of an existing layer to insert before
+     */
     addLayer(layerObject: LayerSpecification | CustomLayerInterface, before?: string, options: StyleSetterOptions = {}) {
         this._checkLoaded();
 

src/style/style_layer/circle_style_layer.js

@@ -15,7 +15,7 @@ import type Transform from '../../geo/transform';
 import type {Bucket, BucketParameters} from '../../data/bucket';
 import type {LayoutProps, PaintProps} from './circle_style_layer_properties';
 import type {LayerSpecification} from '../../style-spec/types';
-import loadGeometry from '../../data/load_geometry';
+
 class CircleStyleLayer extends StyleLayer {
     _unevaluatedLayout: Layout<LayoutProps>;
     layout: PossiblyEvaluated<LayoutProps>;
@@ -40,7 +40,7 @@ class CircleStyleLayer extends StyleLayer {
     }
 
     queryIntersectsFeature(queryGeometry: Array<Point>,
-                           vFeature: VectorTileFeature,
+                           feature: VectorTileFeature,
                            featureState: FeatureState,
                            geometry: Array<Array<Point>>,
                            zoom: number,
@@ -51,7 +51,6 @@ class CircleStyleLayer extends StyleLayer {
             this.paint.get('circle-translate'),
             this.paint.get('circle-translate-anchor'),
             transform.angle, pixelsToTileUnits);
-        const feature = {type: vFeature.type, properties: vFeature.properties, geometry: loadGeometry(vFeature)};
         const radius = this.paint.get('circle-radius').evaluate(feature, featureState);
         const stroke = this.paint.get('circle-stroke-width').evaluate(feature, featureState);
         const size  = radius + stroke;

src/style/style_layer/fill_extrusion_style_layer.js

@@ -15,7 +15,6 @@ import type {BucketParameters} from '../../data/bucket';
 import type {PaintProps} from './fill_extrusion_style_layer_properties';
 import type Transform from '../../geo/transform';
 import type {LayerSpecification} from '../../style-spec/types';
-import loadGeometry from '../../data/load_geometry';
 
 class FillExtrusionStyleLayer extends StyleLayer {
     _transitionablePaint: Transitionable<PaintProps>;
@@ -39,7 +38,7 @@ class FillExtrusionStyleLayer extends StyleLayer {
     }
 
     queryIntersectsFeature(queryGeometry: Array<Point>,
-                           vfeature: VectorTileFeature,
+                           feature: VectorTileFeature,
                            featureState: FeatureState,
                            geometry: Array<Array<Point>>,
                            zoom: number,
@@ -51,7 +50,6 @@ class FillExtrusionStyleLayer extends StyleLayer {
             this.paint.get('fill-extrusion-translate'),
             this.paint.get('fill-extrusion-translate-anchor'),
             transform.angle, pixelsToTileUnits);
-        const feature = {type: vfeature.type, properties: vfeature.properties, geometry: loadGeometry(vfeature)};
         const height = this.paint.get('fill-extrusion-height').evaluate(feature, featureState);
         const base = this.paint.get('fill-extrusion-base').evaluate(feature, featureState);
 

src/style/style_layer/line_style_layer.js

@@ -19,7 +19,6 @@ import type {LayoutProps, PaintProps} from './line_style_layer_properties';
 import type Transform from '../../geo/transform';
 import type Texture from '../../render/texture';
 import type {LayerSpecification} from '../../style-spec/types';
-import loadGeometry from '../../data/load_geometry';
 
 class LineFloorwidthProperty extends DataDrivenProperty<number> {
     useIntegerZoom: true;
@@ -91,7 +90,7 @@ class LineStyleLayer extends StyleLayer {
     }
 
     queryIntersectsFeature(queryGeometry: Array<Point>,
-                           vfeature: VectorTileFeature,
+                           feature: VectorTileFeature,
                            featureState: FeatureState,
                            geometry: Array<Array<Point>>,
                            zoom: number,
@@ -101,7 +100,6 @@ class LineStyleLayer extends StyleLayer {
             this.paint.get('line-translate'),
             this.paint.get('line-translate-anchor'),
             transform.angle, pixelsToTileUnits);
-        const feature = {type: vfeature.type, properties: vfeature.properties, geometry: loadGeometry(vfeature)};
         const halfWidth = pixelsToTileUnits / 2 * getLineWidth(
             this.paint.get('line-width').evaluate(feature, featureState),
             this.paint.get('line-gap-width').evaluate(feature, featureState));

src/ui/map.js

@@ -349,6 +349,7 @@ class Map extends Camera {
         PerformanceUtils.mark(PerformanceMarkers.create);
 
         options = extend({}, defaultOptions, options);
+
         if (options.minZoom != null && options.maxZoom != null && options.minZoom > options.maxZoom) {
             throw new Error(`maxZoom must be greater than or equal to minZoom`);
         }

src/util/web_worker_transfer.js

@@ -89,6 +89,7 @@ register('Color', Color);
 register('Error', Error);
 register('ResolvedImage', ResolvedImage);
 register('StylePropertyFunction', StylePropertyFunction);
+
 register('StyleExpression', StyleExpression, {omit: ['_evaluator']});
 
 register('ZoomDependentExpression', ZoomDependentExpression);