Fix queryRenderedFeatures with terrain

src/style/query_utils.ts

@@ -125,7 +125,7 @@ export function circleIntersection({
         ? (pitchScale === 'map' ? intersectionTestMapMap : intersectionTestMapViewport)
         : (pitchScale === 'map' ? intersectionTestViewportMap : intersectionTestViewportViewport);
 
-    const param = {queryGeometry, size, transform, unwrappedTileID, getElevation} as CircleIntersectionTestParams;
+    const param: CircleIntersectionTestParams = {queryGeometry, size, transform, unwrappedTileID, getElevation};
     for (const ring of geometry) {
         for (const point of ring) {
             if (intersectionTest(param, point)) {

src/style/style_layer/circle_style_layer.ts

@@ -66,13 +66,17 @@
         let transformedPolygon: Array<Point>;
         let transformedSize: number;
         if (pitchAlignment === 'map') {
+            // TODO I have confirmed that this codepath is correct
             transformedPolygon = translatedPolygon;
             transformedSize = size * pixelsToTileUnits;
         } else {
+            // TODO I suspect this codepath is INCORRECT or BROKEN.
+            // TODO Investigate the "cannot calculate elevation if elevation maxzoom > source.maxzoom" warnings
             transformedPolygon = projectQueryGeometry(translatedPolygon, transform, unwrappedTileID, getElevation);
             transformedSize = size;
         }
 
+        // TODO I have confirmed that circleIntersection is correct.
         return circleIntersection({
             queryGeometry: transformedPolygon,
             size: transformedSize,

src/tile/tile_manager.ts

@@ -27,6 +27,7 @@
 import type {MapSourceDataEvent} from '../ui/events';
 import type {Terrain} from '../render/terrain';
 import type {CanvasSourceSpecification} from '../source/canvas_source';
+import {GeoJSONSource} from '../source/geojson_source';
 
 type TileResult = {
     tile: Tile;
@@ -397,7 +398,7 @@
      * Analogy: imagine two sheets of paper in 3D space:
      *   - one sheet = ideal tiles at varying overscaledZ
      *   - the second sheet = maxCoveringZoom
-     * 
+     *
      * @param retainTileMap - this parameters will be updated with the child tiles to keep
      * @param idealTilesWithoutData - which of the ideal tiles currently does not have loaded data
      * @return a set of tiles that need to be loaded
@@ -569,7 +570,7 @@
                 tileSize: this.usedForTerrain ? this.tileSize : this._source.tileSize,
                 minzoom: this._source.minzoom,
                 maxzoom: this._source.type === 'vector' && this.map._zoomLevelsToOverscale !== undefined
-                    ? transform.maxZoom - this.map._zoomLevelsToOverscale 
+                    ? transform.maxZoom - this.map._zoomLevelsToOverscale
                     : this._source.maxzoom,
                 roundZoom: this.usedForTerrain ? false : this._source.roundZoom,
                 reparseOverscaled: this._source.reparseOverscaled,
@@ -1075,14 +1076,24 @@
         if (!transform) return tileResults;
         const allowWorldCopies = transform.getCoveringTilesDetailsProvider().allowWorldCopies();
 
-        const cameraPointQueryGeometry = has3DLayer ?
+        const cameraPointQueryGeometry = true ?
             transform.getCameraQueryGeometry(pointQueryGeometry) :
             pointQueryGeometry;
 
         const project = (point: Point) => transform.screenPointToMercatorCoordinate(point, this.terrain);
+        // TODO I have confirmed that queryGemetry is correct.
         const queryGeometry = this.transformBbox(pointQueryGeometry, project, !allowWorldCopies);
         const cameraQueryGeometry = this.transformBbox(cameraPointQueryGeometry, project, !allowWorldCopies);
 
+        const features: GeoJSON.Feature[] = [{
+            type: 'Feature',
+            properties: {},
+            geometry: {
+                type: 'Polygon',
+                coordinates: [queryGeometry.map(p => p.toLngLat().toArray())]
+            }
+        }];
+
         const ids = this.getIds();
 
         const cameraBounds = Bounds.fromPoints(cameraQueryGeometry);
@@ -1104,7 +1115,7 @@
                 tileSpaceBounds.expandBy(queryPadding);
 
                 if (tileSpaceBounds.intersects(EXTENT_BOUNDS)) {
-
+                    // TODO I need to confirm that tileSpaceQueryGeometry is correct
                     const tileSpaceQueryGeometry: Array<Point> = queryGeometry.map((c) => tileID.getTilePoint(c));
                     const tileSpaceCameraQueryGeometry = cameraQueryGeometry.map((c) => tileID.getTilePoint(c));
 
@@ -1119,6 +1130,11 @@
             }
         }
 
+        (this.map.getSource('bbox') as GeoJSONSource).setData({
+            type: 'FeatureCollection',
+            features
+        });
+
         return tileResults;
     }