v3.7.0-beta.1

.eslintrc

@@ -7,7 +7,10 @@
         "plugin:@typescript-eslint/recommended-type-checked"
     ],
     "parserOptions": {
-        "EXPERIMENTAL_useProjectService": true
+        "projectService": {
+            "defaultProject": "./tsconfig.json",
+            "allowDefaultProject": ["*.js"]
+        }
     },
     "plugins": [
         "jsdoc",
@@ -33,26 +36,32 @@
     },
     "rules": {
         // temporarily disabled for easier migration to TypeScript
+        "no-loss-of-precision": "off",
         "@typescript-eslint/no-this-alias": "off",
         "@typescript-eslint/ban-ts-comment": "off",
         "@typescript-eslint/unbound-method": "off",
         "@typescript-eslint/no-unsafe-call": "off",
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/no-unsafe-return": "off",
         "@typescript-eslint/no-unsafe-argument": "off",
-        "@typescript-eslint/no-misused-promises": "off",
         "@typescript-eslint/no-unsafe-assignment": "off",
         "@typescript-eslint/no-loss-of-precision": "off",
         "@typescript-eslint/no-unsafe-member-access": "off",
-        "@typescript-eslint/no-redundant-type-constituents": "off",
+        "@typescript-eslint/only-throw-error": "off",
 
         // TypeScript specific rules
+        "@typescript-eslint/method-signature-style": "error",
         "@typescript-eslint/no-floating-promises": "off",
-        "@typescript-eslint/consistent-type-exports": "off",
-        "@typescript-eslint/consistent-type-imports": "off",
+        "@typescript-eslint/consistent-type-exports": "error",
+        "@typescript-eslint/consistent-type-imports": "error",
         "@typescript-eslint/restrict-template-expressions": ["off", { "allowNever": true }],
         "@typescript-eslint/no-unnecessary-type-constraint": "off",
-        "@typescript-eslint/no-unused-vars": ["off", { "argsIgnorePattern": "^_" }],
+        "no-unused-vars": "off",
+        "@typescript-eslint/no-unused-vars": ["error", {
+            "args": "none",
+            "caughtErrors": "none",
+            "ignoreRestSiblings": true
+        }],
 
         // Disable those rules since TypeScript provides the same checks as part of standard type checking
         // See https://typescript-eslint.io/troubleshooting/performance-troubleshooting/#eslint-plugin-import
@@ -61,11 +70,17 @@
         "import/default": "off",
         "import/no-named-as-default-member": "off",
         "import/no-unresolved": "off",
+        "import/no-named-as-default": "off",
 
         // Import plugin rules
         "no-duplicate-imports": "off",
         "import/no-duplicates": "error",
 
+        "import/order": ["error", {
+            "groups": [["builtin", "external", "internal", "unknown", "parent", "sibling", "index", "object"], "type"],
+            "newlines-between": "always"
+        }],
+
         // Restrict imports outside of the style-spec
         "import/no-restricted-paths": ["error", {
             "zones": [{
@@ -124,7 +139,7 @@
         }],
         "no-multiple-empty-lines": ["error", {
             "max": 1
-        }],
+        }]
     },
     "overrides": [
         {
@@ -256,6 +271,7 @@
         "es6": true
     },
     "ignorePatterns": [
-        "dist/**/*"
+        "dist/**/*",
+        "src/style-spec/bin/*"
     ]
 }

3d-style/data/bucket/model_bucket.ts

@@ -3,19 +3,20 @@ import {register} from '../../../src/util/web_worker_transfer';
 import loadGeometry from '../../../src/data/load_geometry';
 import toEvaluationFeature from '../../../src/data/evaluation_feature';
 import EvaluationParameters from '../../../src/style/evaluation_parameters';
-import Point from '@mapbox/point-geometry';
 import {vec3} from 'gl-matrix';
 import {InstanceVertexArray} from '../../../src/data/array_types';
 import assert from 'assert';
 import {warnOnce} from '../../../src/util/util';
 import {rotationScaleYZFlipMatrix} from '../../util/model_util';
 import {tileToMeter} from '../../../src/geo/mercator_coordinate';
 import {instanceAttributes} from '../model_attributes';
-import {ReplacementSource, regionsEquals, transformPointToTile, pointInFootprint, skipClipping} from '../../../3d-style/source/replacement_source';
+import {regionsEquals, transformPointToTile, pointInFootprint, skipClipping} from '../../../3d-style/source/replacement_source';
 import {LayerTypeMask} from '../../../3d-style/util/conflation';
+import {isValidUrl} from '../../../src/style-spec/validate/validate_model';
 
 import type ModelStyleLayer from '../../style/style_layer/model_style_layer';
-import {isValidUrl} from '../../../src/style-spec/validate/validate_model';
+import type {ReplacementSource} from '../../../3d-style/source/replacement_source';
+import type Point from '@mapbox/point-geometry';
 import type {EvaluationFeature} from '../../../src/data/evaluation_feature';
 import type {mat4} from 'gl-matrix';
 import type {CanonicalTileID, OverscaledTileID, UnwrappedTileID} from '../../../src/source/tile_id';
@@ -26,7 +27,6 @@ import type {
     IndexedFeature,
     PopulateParameters
 } from '../../../src/data/bucket';
-
 import type Context from '../../../src/gl/context';
 import type VertexBuffer from '../../../src/gl/vertex_buffer';
 import type {FeatureState} from '../../../src/style-spec/expression/index';
@@ -249,10 +249,10 @@ class ModelBucket implements Bucket {
         if (regionsEquals(this.activeReplacements, newReplacements)) {
             return false;
         }
+
         this.activeReplacements = newReplacements;
 
         let reuploadNeeded = false;
-
         for (const modelId in this.instancesPerModel) {
             const perModelVertexArray: PerModelAttributes = this.instancesPerModel[modelId];
             const va = perModelVertexArray.instancedDataArray;
@@ -265,7 +265,8 @@ class ModelBucket implements Bucket {
                     const i16 = (i + offset) * 16;
 
                     let x_ = va.float32[i16 + 0];
-                    x_ = x_ > EXTENT ? x_ - EXTENT : x_;
+                    const wasHidden = x_ > EXTENT;
+                    x_ = wasHidden ? x_ - EXTENT : x_;
                     const x = Math.floor(x_);
                     const y = va.float32[i16 + 1];
 
@@ -278,13 +279,13 @@ class ModelBucket implements Bucket {
                         }
 
                         const p = transformPointToTile(x, y, coord.canonical, region.footprintTileId.canonical);
-                        hidden = pointInFootprint(p, region);
+                        hidden = pointInFootprint(p, region.footprint);
 
                         if (hidden) break;
                     }
 
                     va.float32[i16] = hidden ? x_ + EXTENT : x_;
-                    reuploadNeeded = reuploadNeeded || hidden;
+                    reuploadNeeded = reuploadNeeded || (hidden !== wasHidden);
                 }
             }
         }

3d-style/data/bucket/tiled_3d_model_bucket.ts

@@ -3,7 +3,6 @@ import Point from '@mapbox/point-geometry';
 import browser from '../../../src/util/browser';
 import {register} from '../../../src/util/web_worker_transfer';
 import {uploadNode, destroyNodeArrays, destroyBuffers, ModelTraits, HEIGHTMAP_DIM} from '../model';
-import {OverscaledTileID} from '../../../src/source/tile_id';
 import {FeatureVertexArray} from '../../../src/data/array_types';
 import {number as interpolate} from '../../../src/style-spec/util/interpolate';
 import {clamp} from '../../../src/util/util';
@@ -12,18 +11,18 @@ import {ZoomConstantExpression} from '../../../src/style-spec/expression/index';
 import {Aabb} from '../../../src/util/primitives';
 import {vec3, mat4} from 'gl-matrix';
 
+import type {OverscaledTileID, CanonicalTileID, UnwrappedTileID} from '../../../src/source/tile_id';
 import type ModelStyleLayer from '../../style/style_layer/model_style_layer';
 import type {ReplacementSource} from '../../source/replacement_source';
 import type {Bucket} from '../../../src/data/bucket';
 import type {Node} from '../model';
 import type {EvaluationFeature} from '../../../src/data/evaluation_feature';
-import type {CanonicalTileID, UnwrappedTileID} from '../../../src/source/tile_id';
 import type Context from '../../../src/gl/context';
 import type {ProjectionSpecification} from '../../../src/style-spec/types';
 import type Painter from '../../../src/render/painter';
 import type {vec4} from 'gl-matrix';
 import type {Terrain} from '../../../src/terrain/terrain';
-import FeatureIndex from '../../../src/data/feature_index';
+import type FeatureIndex from '../../../src/data/feature_index';
 import type {GridIndex} from '../../../src/types/grid-index';
 import type {TileFootprint} from '../../../3d-style/util/conflation';
 
@@ -80,6 +79,7 @@ export class Tiled3dModelFeature {
     node: Node;
     aabb: Aabb;
     emissionHeightBasedParams: Array<[number, number, number, number, number]>;
+    cameraCollisionOpacity: number;
     constructor(node: Node) {
         this.node = node;
         this.evaluatedRMEA = [[1, 0, 0, 1],
@@ -93,6 +93,7 @@ export class Tiled3dModelFeature {
         this.evaluatedScale = [1, 1, 1];
         this.evaluatedColor = [];
         this.emissionHeightBasedParams = [];
+        this.cameraCollisionOpacity = 1;
         // Needs to calculate geometry
         this.feature = {type: 'Point', id: node.id, geometry: [], properties: {'height' : getNodeHeight(node)}};
         this.aabb = this._getLocalBounds();
@@ -555,7 +556,7 @@ class Tiled3dModelBucket implements Bucket {
             const mesh = nodeInfo.node.meshes[0];
             const meshAabb = mesh.transformedAabb;
             if (x < meshAabb.min[0] || y < meshAabb.min[1] || x > meshAabb.max[0] || y > meshAabb.max[1]) continue;
-            if (nodeInfo.node.hidden === true) return {height: 0.0, maxHeight: nodeInfo.feature.properties["height"], hidden: false, verticalScale: nodeInfo.evaluatedScale[2]};
+            if (nodeInfo.node.hidden === true) return {height: Infinity, maxHeight: nodeInfo.feature.properties["height"], hidden: false, verticalScale: nodeInfo.evaluatedScale[2]};
 
             assert(mesh.heightmap);
 

3d-style/data/model.ts

@@ -1,8 +1,5 @@
 import LngLat from '../../src/geo/lng_lat';
-import Color from '../../src/style-spec/util/color';
 import Texture from '../../src/render/texture';
-import {ModelLayoutArray, TriangleIndexArray, NormalLayoutArray, TexcoordLayoutArray, FeatureVertexArray} from '../../src/data/array_types';
-import {StructArray} from '../../src/util/struct_array';
 import {Aabb} from '../../src/util/primitives';
 import {mat4, vec4} from 'gl-matrix';
 import {modelAttributes, normalAttributes, texcoordAttributes, color3fAttributes, color4fAttributes, featureAttributes} from './model_attributes';
@@ -12,6 +9,9 @@ import {number as interpolate} from '../../src/style-spec/util/interpolate';
 import MercatorCoordinate, {getMetersPerPixelAtLatitude, getLatitudeScale, mercatorZfromAltitude} from '../../src/geo/mercator_coordinate';
 import {rotationScaleYZFlipMatrix, getBoxBottomFace, rotationFor3Points, convertModelMatrixForGlobe} from '../util/model_util';
 
+import type {StructArray} from '../../src/util/struct_array';
+import type {ModelLayoutArray, TriangleIndexArray, NormalLayoutArray, TexcoordLayoutArray, FeatureVertexArray} from '../../src/data/array_types';
+import type Color from '../../src/style-spec/util/color';
 import type {vec2, vec3, quat} from 'gl-matrix';
 import type Context from '../../src/gl/context';
 import type IndexBuffer from '../../src/gl/index_buffer';