diff --git a/src/core/math/index.ts b/src/core/math/index.ts
new file mode 100644
index 000000000..23c7444b6
--- /dev/null
+++ b/src/core/math/index.ts
@@ -0,0 +1,2 @@
+export { default as Ray } from './Ray';
+export { default as Plane } from './Plane';
diff --git a/src/index.ts b/src/index.ts
index 863ecf5a0..096e1a741 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -8,6 +8,8 @@ import * as DomUtil from './core/util/dom';
 import * as StringUtil from './core/util/strings';
 import * as MapboxUtil from './core/mapbox';
 import * as BBOXUtil from './core/util/bbox';
+/** @namespace math */
+export * as math from './core/math';
 
 import * as MicroTask from './core/MicroTask';
 export { Util, DomUtil, StringUtil, MapboxUtil, MicroTask, BBOXUtil };
diff --git a/src/map/Map.Camera.ts b/src/map/Map.Camera.ts
index e8119e645..ebfce2da9 100644
--- a/src/map/Map.Camera.ts
+++ b/src/map/Map.Camera.ts
@@ -49,8 +49,7 @@ declare module "./Map" {
         _pointToContainerPoint(point: Point, zoom?: number, out?: Point): Point;
         //@internal
         _pointsAtResToContainerPoints(point: Point[], res?: number, altitude?: number[], out?: Point[]): Point[];
-        //@internal
-        getContainerPointRay(from: Vector3, to: Vector3, containerPoint: Point, near: number, far: number);
+        getContainerPointRay(from: Vector3, to: Vector3, containerPoint: Point, near?: number, far?: number);
         //@internal
         _query3DTilesInfo(containerPoint: Point);
         //@internal
@@ -644,7 +643,7 @@ Map.include(/** @lends Map.prototype */{
         const cp = [0, 0, 0],
             coord0 = [0, 0, 0, 1],
             coord1 = [0, 0, 0, 1];
-        return function (from: Vector3, to: Vector3, containerPoint: Point, near = 0, far = 1) {
+        return function (from: Vector3, to: Vector3, containerPoint: Point, near:number = 0, far:number = 1) {
         const w2 = this.width / 2 || 1,
                 h2 = this.height / 2 || 1;
             const p = containerPoint;