Fix queryTerrainElevation (#1922)

Author: Pessimistress

src/mapbox/create-ref.ts

@@ -1,4 +1,4 @@
-import type {MapboxMap, LngLatLike, PointLike} from '../types';
+import type {MapboxMap, LngLatLike, PointLike, ElevationQueryOptions} from '../types';
 import type Mapbox from './mapbox';
 
 /** These methods may break the react binding if called directly */
@@ -50,6 +50,16 @@ export default function createRef(mapInstance: Mapbox, mapLib: any): MapRef {
     },
     unproject: (point: PointLike) => {
       return mapInstance.transform.pointLocation(mapLib.Point.convert(point));
+    },
+    queryTerrainElevation: (lnglat: LngLatLike, options: ElevationQueryOptions) => {
+      // @ts-ignore transform not defined
+      const tr = map.transform;
+      // @ts-ignore transform not defined
+      map.transform = mapInstance.transform;
+      const result = map.queryTerrainElevation(lnglat, options);
+      // @ts-ignore transform not defined
+      map.transform = tr;
+      return result;
     }
   };
 

src/mapbox/mapbox.ts

@@ -612,18 +612,6 @@ export default class Mapbox {
     const renderTransform = cloneTransform(map.transform);
     map.painter.transform = renderTransform;
 
-    // Terrain update is called by the painter
-    // Elevation changes must be reflected back to the original transform so that input handlers work correctly
-    // @ts-ignore method may be undefined
-    const updateElevation = renderTransform.updateElevation;
-    if (updateElevation) {
-      // @ts-ignore
-      renderTransform.updateElevation = arg => {
-        map.transform.elevation = renderTransform.elevation;
-        updateElevation.call(renderTransform, arg);
-        updateElevation.call(map.transform, arg);
-      };
-    }
     this._renderTransform = renderTransform;
   }
 

src/types/index.ts

@@ -14,7 +14,8 @@ export type {
   FullscreenControl as MapboxFullscreenControl,
   GeolocateControl as MapboxGeolocateControl,
   NavigationControl as MapboxNavigationControl,
-  ScaleControl as MapboxScaleControl
+  ScaleControl as MapboxScaleControl,
+  ElevationQueryOptions
 } from 'mapbox-gl';
 
 /**