Fix interaction handlers not working on model layers

GitOrigin-RevId: 529d81e87d1dff1598a54db77e6a8f7955ff4a04

Author: ibesora

3d-style/style/style_layer/building_style_layer.ts

@@ -73,6 +73,7 @@ class BuildingStyleLayer extends StyleLayer {
         pixelPosMatrix: Float32Array,
         elevationHelper: DEMSampler | null | undefined,
         layoutVertexArrayOffset: number,
+        scope: string | undefined
     ): boolean | number {
         let height = this.layout.get('building-height').evaluate(feature, featureState);
         const base = this.layout.get('building-base').evaluate(feature, featureState);

3d-style/style/style_layer/model_style_layer.ts

@@ -29,6 +29,7 @@ import type {EvaluationFeature} from '../../../src/data/evaluation_feature';
 import type {ProgramName} from '../../../src/render/program';
 import type {QueryResult} from '../../../src/source/query_features';
 import type SourceCache from '../../../src/source/source_cache';
+import type {DEMSampler} from '../../../src/terrain/elevation';
 
 class ModelStyleLayer extends StyleLayer {
     override type: 'model';
@@ -167,6 +168,10 @@ class ModelStyleLayer extends StyleLayer {
         geometry: Array<Array<Point>>,
         zoom: number,
         transform: Transform,
+        pixelPosMatrix: Float32Array,
+        elevationHelper: DEMSampler | null | undefined,
+        layoutVertexArrayOffset: number,
+        scope: string | undefined
     ): number | boolean {
         if (!this.modelManager) return false;
         const modelManager = this.modelManager;
@@ -179,7 +184,7 @@ class ModelStyleLayer extends StyleLayer {
                 (feature.properties && feature.properties.hasOwnProperty("id")) ? (feature.properties["id"] as string | number) : undefined;
             if (instances.idToFeaturesIndex.hasOwnProperty(featureId)) {
                 const modelFeature = instances.features[instances.idToFeaturesIndex[featureId]];
-                const model = modelManager.getModel(modelId, this.scope);
+                const model = modelManager.getModel(modelId, scope || this.scope);
                 if (!model) return false;
 
                 let matrix: mat4 = [];

src/data/feature_index.ts

@@ -41,6 +41,7 @@ type QueryParameters = {
     availableImages: ImageId[];
     worldview: string | undefined;
     queryRadius?: number;
+    scope?: string | undefined
 };
 
 type FeatureIndices = FeatureIndexStruct | {
@@ -176,7 +177,7 @@ class FeatureIndex {
                 }
 
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-                return styleLayer.queryIntersectsFeature(tilespaceGeometry, feature, featureState, featureGeometry, this.z, transform, pixelPosMatrix, elevationHelper, layoutVertexArrayOffset);
+                return styleLayer.queryIntersectsFeature(tilespaceGeometry, feature, featureState, featureGeometry, this.z, transform, pixelPosMatrix, elevationHelper, layoutVertexArrayOffset, params.scope);
             };
 
             this.loadMatchingFeature(

src/source/query_features.ts

@@ -96,6 +96,7 @@ export function queryRenderedFeatures(
     availableImages: ImageId[],
     transform: Transform,
     visualizeQueryGeometry: boolean = false,
+    scope: string | undefined = undefined
 ): QueryResult {
     const sourceCacheTransform = query.sourceCache.transform;
     const tileResults = query.sourceCache.tilesIn(queryGeometry, query.has3DLayers, visualizeQueryGeometry);
@@ -110,6 +111,7 @@ export function queryRenderedFeatures(
             transform,
             sourceCacheTransform,
             visualizeQueryGeometry,
+            scope
         );
 
         if (Object.keys(queryResults).length) {

src/source/tile.ts

@@ -524,6 +524,7 @@ class Tile {
         transform: Transform,
         sourceCacheTransform: Transform,
         visualizeQueryGeometry: boolean,
+        scope: string | undefined
     ): QueryResult {
         Debug.run(() => {
             if (visualizeQueryGeometry) {
@@ -558,7 +559,8 @@ class Tile {
                 availableImages,
                 tileTransform: this.tileTransform,
                 worldview: this.worldview,
-                queryRadius: maxFeatureQueryRadius
+                queryRadius: maxFeatureQueryRadius,
+                scope
             }
         );
     }

src/style/style.ts

@@ -3524,6 +3524,7 @@ class Style extends Evented<MapEvents> {
                 this._availableImages,
                 transform,
                 showQueryGeometry,
+                this.getActualScope()
             );
 
             if (Object.keys(queryResult).length) queryResults.push(queryResult);

src/style/style_layer.ts

@@ -482,6 +482,7 @@ class StyleLayer extends Evented {
         _pixelPosMatrix: Float32Array,
         _elevationHelper: DEMSampler | null | undefined,
         _layoutVertexArrayOffset: number,
+        scope: string | undefined
         // @ts-expect-error - TS2355 - A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value.
     ): boolean | number {}
 }

test/integration/query-tests/model/basemap/expected.json

@@ -0,0 +1,17 @@
+[
+  {
+    "type": "Feature",
+    "state": {},
+    "geometry": {
+      "type": "Point",
+      "coordinates": [
+        -122.40923747420311,
+        37.7815259123996
+      ]
+    },
+    "properties": {
+      "id": 13
+    },
+    "source": "trees"
+  }
+]

test/integration/query-tests/model/basemap/style.json

@@ -0,0 +1,58 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "height": 512,
+      "allowed": 0.0015,
+      "operations": [
+        ["addSource", 
+        "trees", 
+        {
+            "type": "geojson",
+            "data": "local://data/trees.geojson"
+        }],
+        ["addLayer", {
+            "id": "tree-layer-diffuse",
+            "type": "model",
+            "source": "trees",
+            "layout": {
+                "model-id": "tree-diffuse"
+            },
+            "paint": {
+                "model-scale": [ 70.0, 50.0, 50.0],
+                "model-translation": [0, 0, 100]
+            }
+            }
+        ],
+        ["addModel", "tree-diffuse", "local://models/tree-no-material.glb"],
+        ["wait"]
+      ],
+      "queryGeometry": [
+        165,
+        279
+      ]
+    }
+  },
+  "sources": {
+  },
+  "transition": {
+    "duration": 0
+  },
+  "models": {
+  },
+  "pitch": 60,
+  "bearing": 0,
+  "zoom": 15,
+  "schema": {},
+  "center": [
+    -122.40784,
+    37.78432
+  ],
+  "light": {
+    "intensity": 1,
+    "position": [1, 110, 90],
+    "anchor": "map"
+  },
+  "layers": [
+  ]
+}