@math.gl/geospatial 3.6.0-alpha.1 → 3.6.0-alpha.2

package/dist/esm/ellipsoid/helpers/scale-to-geodetic-surface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/ellipsoid/helpers/scale-to-geodetic-surface.ts"],"names":["Vector3","_MathUtils","scratchVector","scaleToGeodeticSurfaceIntersection","scaleToGeodeticSurfaceGradient","scaleToGeodeticSurface","cartesian","ellipsoid","result","oneOverRadii","oneOverRadiiSquared","centerToleranceSquared","from","positionX","x","positionY","y","positionZ","z","oneOverRadiiX","oneOverRadiiY","oneOverRadiiZ","x2","y2","z2","squaredNorm","ratio","Math","sqrt","Number","isFinite","undefined","intersection","copy","scale","to","oneOverRadiiSquaredX","oneOverRadiiSquaredY","oneOverRadiiSquaredZ","gradient","set","lambda","len","correction","xMultiplier","yMultiplier","zMultiplier","func","xMultiplier2","yMultiplier2","zMultiplier2","xMultiplier3","yMultiplier3","zMultiplier3","denominator","derivative","abs","EPSILON12"],"mappings":"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","sourcesContent":["/* eslint-disable */\nimport {Vector3, assert, _MathUtils} from '@math.gl/core';\nimport * as vec3 from 'gl-matrix/vec3';\n\nconst scratchVector = new Vector3();\nconst scaleToGeodeticSurfaceIntersection = new Vector3();\nconst scaleToGeodeticSurfaceGradient = new Vector3();\n\n// Scales the provided Cartesian position along the geodetic surface normal\n// so that it is on the surface of this ellipsoid.  If the position is\n// at the center of the ellipsoid, this function returns undefined.\nexport default function scaleToGeodeticSurface(cartesian, ellipsoid, result = new Vector3()) {\n  const {oneOverRadii, oneOverRadiiSquared, centerToleranceSquared} = ellipsoid;\n\n  scratchVector.from(cartesian);\n\n  const positionX = cartesian.x;\n  const positionY = cartesian.y;\n  const positionZ = cartesian.z;\n\n  const oneOverRadiiX = oneOverRadii.x;\n  const oneOverRadiiY = oneOverRadii.y;\n  const oneOverRadiiZ = oneOverRadii.z;\n\n  const x2 = positionX * positionX * oneOverRadiiX * oneOverRadiiX;\n  const y2 = positionY * positionY * oneOverRadiiY * oneOverRadiiY;\n  const z2 = positionZ * positionZ * oneOverRadiiZ * oneOverRadiiZ;\n\n  // Compute the squared ellipsoid norm.\n  const squaredNorm = x2 + y2 + z2;\n  const ratio = Math.sqrt(1.0 / squaredNorm);\n\n  // When very close to center or at center\n  if (!Number.isFinite(ratio)) {\n    return undefined;\n  }\n\n  // As an initial approximation, assume that the radial intersection is the projection point.\n  const intersection = scaleToGeodeticSurfaceIntersection;\n  intersection.copy(cartesian).scale(ratio);\n\n  // If the position is near the center, the iteration will not converge.\n  if (squaredNorm < centerToleranceSquared) {\n    return intersection.to(result);\n  }\n\n  const oneOverRadiiSquaredX = oneOverRadiiSquared.x;\n  const oneOverRadiiSquaredY = oneOverRadiiSquared.y;\n  const oneOverRadiiSquaredZ = oneOverRadiiSquared.z;\n\n  // Use the gradient at the intersection point in place of the true unit normal.\n  // The difference in magnitude will be absorbed in the multiplier.\n  const gradient = scaleToGeodeticSurfaceGradient;\n  gradient.set(\n    intersection.x * oneOverRadiiSquaredX * 2.0,\n    intersection.y * oneOverRadiiSquaredY * 2.0,\n    intersection.z * oneOverRadiiSquaredZ * 2.0\n  );\n\n  // Compute the initial guess at the normal vector multiplier, lambda.\n  let lambda = ((1.0 - ratio) * cartesian.len()) / (0.5 * gradient.len());\n  let correction = 0.0;\n\n  let xMultiplier;\n  let yMultiplier;\n  let zMultiplier;\n  let func;\n\n  do {\n    lambda -= correction;\n\n    xMultiplier = 1.0 / (1.0 + lambda * oneOverRadiiSquaredX);\n    yMultiplier = 1.0 / (1.0 + lambda * oneOverRadiiSquaredY);\n    zMultiplier = 1.0 / (1.0 + lambda * oneOverRadiiSquaredZ);\n\n    const xMultiplier2 = xMultiplier * xMultiplier;\n    const yMultiplier2 = yMultiplier * yMultiplier;\n    const zMultiplier2 = zMultiplier * zMultiplier;\n\n    const xMultiplier3 = xMultiplier2 * xMultiplier;\n    const yMultiplier3 = yMultiplier2 * yMultiplier;\n    const zMultiplier3 = zMultiplier2 * zMultiplier;\n\n    func = x2 * xMultiplier2 + y2 * yMultiplier2 + z2 * zMultiplier2 - 1.0;\n\n    // \"denominator\" here refers to the use of this expression in the velocity and acceleration\n    // computations in the sections to follow.\n    const denominator =\n      x2 * xMultiplier3 * oneOverRadiiSquaredX +\n      y2 * yMultiplier3 * oneOverRadiiSquaredY +\n      z2 * zMultiplier3 * oneOverRadiiSquaredZ;\n\n    const derivative = -2.0 * denominator;\n\n    correction = func / derivative;\n  } while (Math.abs(func) > _MathUtils.EPSILON12);\n\n  return scratchVector.scale([xMultiplier, yMultiplier, zMultiplier]).to(result);\n}\n"],"file":"scale-to-geodetic-surface.js"}
+{"version":3,"sources":["../../../../src/ellipsoid/helpers/scale-to-geodetic-surface.ts"],"names":["Vector3","_MathUtils","scratchVector","scaleToGeodeticSurfaceIntersection","scaleToGeodeticSurfaceGradient","scaleToGeodeticSurface","cartesian","ellipsoid","result","oneOverRadii","oneOverRadiiSquared","centerToleranceSquared","from","positionX","x","positionY","y","positionZ","z","oneOverRadiiX","oneOverRadiiY","oneOverRadiiZ","x2","y2","z2","squaredNorm","ratio","Math","sqrt","Number","isFinite","undefined","intersection","copy","scale","to","oneOverRadiiSquaredX","oneOverRadiiSquaredY","oneOverRadiiSquaredZ","gradient","set","lambda","len","correction","xMultiplier","yMultiplier","zMultiplier","func","xMultiplier2","yMultiplier2","zMultiplier2","xMultiplier3","yMultiplier3","zMultiplier3","denominator","derivative","abs","EPSILON12"],"mappings":"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","sourcesContent":["/* eslint-disable */\nimport {Vector3, _MathUtils} from '@math.gl/core';\nimport type Ellipsoid from '../ellipsoid';\n\nconst scratchVector = new Vector3();\nconst scaleToGeodeticSurfaceIntersection = new Vector3();\nconst scaleToGeodeticSurfaceGradient = new Vector3();\n\n// Scales the provided Cartesian position along the geodetic surface normal\n// so that it is on the surface of this ellipsoid.  If the position is\n// at the center of the ellipsoid, this function returns undefined.\nexport default function scaleToGeodeticSurface(\n  cartesian: number[],\n  ellipsoid: Ellipsoid,\n  result: number[] = []\n): number[] {\n  const {oneOverRadii, oneOverRadiiSquared, centerToleranceSquared} = ellipsoid;\n\n  scratchVector.from(cartesian);\n\n  const positionX = scratchVector.x;\n  const positionY = scratchVector.y;\n  const positionZ = scratchVector.z;\n\n  const oneOverRadiiX = oneOverRadii.x;\n  const oneOverRadiiY = oneOverRadii.y;\n  const oneOverRadiiZ = oneOverRadii.z;\n\n  const x2 = positionX * positionX * oneOverRadiiX * oneOverRadiiX;\n  const y2 = positionY * positionY * oneOverRadiiY * oneOverRadiiY;\n  const z2 = positionZ * positionZ * oneOverRadiiZ * oneOverRadiiZ;\n\n  // Compute the squared ellipsoid norm.\n  const squaredNorm = x2 + y2 + z2;\n  const ratio = Math.sqrt(1.0 / squaredNorm);\n\n  // When very close to center or at center\n  if (!Number.isFinite(ratio)) {\n    return undefined;\n  }\n\n  // As an initial approximation, assume that the radial intersection is the projection point.\n  const intersection = scaleToGeodeticSurfaceIntersection;\n  intersection.copy(cartesian).scale(ratio);\n\n  // If the position is near the center, the iteration will not converge.\n  if (squaredNorm < centerToleranceSquared) {\n    return intersection.to(result);\n  }\n\n  const oneOverRadiiSquaredX = oneOverRadiiSquared.x;\n  const oneOverRadiiSquaredY = oneOverRadiiSquared.y;\n  const oneOverRadiiSquaredZ = oneOverRadiiSquared.z;\n\n  // Use the gradient at the intersection point in place of the true unit normal.\n  // The difference in magnitude will be absorbed in the multiplier.\n  const gradient = scaleToGeodeticSurfaceGradient;\n  gradient.set(\n    intersection.x * oneOverRadiiSquaredX * 2.0,\n    intersection.y * oneOverRadiiSquaredY * 2.0,\n    intersection.z * oneOverRadiiSquaredZ * 2.0\n  );\n\n  // Compute the initial guess at the normal vector multiplier, lambda.\n  let lambda = ((1.0 - ratio) * scratchVector.len()) / (0.5 * gradient.len());\n  let correction = 0.0;\n\n  let xMultiplier;\n  let yMultiplier;\n  let zMultiplier;\n  let func;\n\n  do {\n    lambda -= correction;\n\n    xMultiplier = 1.0 / (1.0 + lambda * oneOverRadiiSquaredX);\n    yMultiplier = 1.0 / (1.0 + lambda * oneOverRadiiSquaredY);\n    zMultiplier = 1.0 / (1.0 + lambda * oneOverRadiiSquaredZ);\n\n    const xMultiplier2 = xMultiplier * xMultiplier;\n    const yMultiplier2 = yMultiplier * yMultiplier;\n    const zMultiplier2 = zMultiplier * zMultiplier;\n\n    const xMultiplier3 = xMultiplier2 * xMultiplier;\n    const yMultiplier3 = yMultiplier2 * yMultiplier;\n    const zMultiplier3 = zMultiplier2 * zMultiplier;\n\n    func = x2 * xMultiplier2 + y2 * yMultiplier2 + z2 * zMultiplier2 - 1.0;\n\n    // \"denominator\" here refers to the use of this expression in the velocity and acceleration\n    // computations in the sections to follow.\n    const denominator =\n      x2 * xMultiplier3 * oneOverRadiiSquaredX +\n      y2 * yMultiplier3 * oneOverRadiiSquaredY +\n      z2 * zMultiplier3 * oneOverRadiiSquaredZ;\n\n    const derivative = -2.0 * denominator;\n\n    correction = func / derivative;\n  } while (Math.abs(func) > _MathUtils.EPSILON12);\n\n  return scratchVector.scale([xMultiplier, yMultiplier, zMultiplier]).to(result);\n}\n"],"file":"scale-to-geodetic-surface.js"}

package/dist/esm/type-utils.js

@@ -1,54 +1,56 @@
-import { Vector3, isArray, toRadians, toDegrees, config } from '@math.gl/core';
+import { Vector3, toRadians, toDegrees, config } from '@math.gl/core';
 import { WGS84_CONSTANTS } from './constants';
 
-const noop = x => x;
+function identity(x) {
+  return x;
+}
 
 const scratchVector = new Vector3();
-export function fromCartographic(cartographic, result = [-0, -0, -0], map = noop) {
-  if (isArray(cartographic)) {
-    result[0] = map(cartographic[0]);
-    result[1] = map(cartographic[1]);
-    result[2] = cartographic[2];
-  } else if ('longitude' in cartographic) {
+export function fromCartographic(cartographic, result = [], map = identity) {
+  if ('longitude' in cartographic) {
     result[0] = map(cartographic.longitude);
     result[1] = map(cartographic.latitude);
     result[2] = cartographic.height;
-  } else {
+  } else if ('x' in cartographic) {
     result[0] = map(cartographic.x);
     result[1] = map(cartographic.y);
     result[2] = cartographic.z;
+  } else {
+    result[0] = map(cartographic[0]);
+    result[1] = map(cartographic[1]);
+    result[2] = cartographic[2];
   }
 
   return result;
 }
 export function fromCartographicToRadians(cartographic, vector = []) {
-  return fromCartographic(cartographic, vector, config._cartographicRadians ? noop : toRadians);
+  return fromCartographic(cartographic, vector, config._cartographicRadians ? identity : toRadians);
 }
 export function fromCartographicToDegrees(cartographic, vector = []) {
-  return fromCartographic(cartographic, vector, config._cartographicRadians ? toDegrees : noop);
+  return fromCartographic(cartographic, vector, config._cartographicRadians ? toDegrees : identity);
 }
-export function toCartographic(vector, cartographic, map = noop) {
-  if (isArray(cartographic)) {
-    cartographic[0] = map(vector[0]);
-    cartographic[1] = map(vector[1]);
-    cartographic[2] = vector[2];
-  } else if ('longitude' in cartographic) {
+export function toCartographic(vector, cartographic, map = identity) {
+  if ('longitude' in cartographic) {
     cartographic.longitude = map(vector[0]);
     cartographic.latitude = map(vector[1]);
     cartographic.height = vector[2];
-  } else {
+  } else if ('x' in cartographic) {
     cartographic.x = map(vector[0]);
     cartographic.y = map(vector[1]);
     cartographic.z = vector[2];
+  } else {
+    cartographic[0] = map(vector[0]);
+    cartographic[1] = map(vector[1]);
+    cartographic[2] = vector[2];
   }
 
   return cartographic;
 }
 export function toCartographicFromRadians(vector, cartographic) {
-  return toCartographic(vector, cartographic, config._cartographicRadians ? noop : toDegrees);
+  return toCartographic(vector, cartographic, config._cartographicRadians ? identity : toDegrees);
 }
 export function toCartographicFromDegrees(vector, cartographic) {
-  return toCartographic(vector, cartographic, config._cartographicRadians ? toRadians : noop);
+  return toCartographic(vector, cartographic, config._cartographicRadians ? toRadians : identity);
 }
 export function isWGS84(vector) {
   if (!vector) {

package/dist/esm/type-utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/type-utils.ts"],"names":["Vector3","isArray","toRadians","toDegrees","config","WGS84_CONSTANTS","noop","x","scratchVector","fromCartographic","cartographic","result","map","longitude","latitude","height","y","z","fromCartographicToRadians","vector","_cartographicRadians","fromCartographicToDegrees","toCartographic","toCartographicFromRadians","toCartographicFromDegrees","isWGS84","from","oneOverRadiiSquared","centerToleranceSquared","x2","y2","z2","Math","abs"],"mappings":"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","sourcesContent":["// This file is derived from the Cesium math library under Apache 2 license\n// See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md\n\nimport {NumericArray} from '@math.gl/types';\nimport {Vector3, isArray, toRadians, toDegrees, config} from '@math.gl/core';\nimport {WGS84_CONSTANTS} from './constants';\n\ntype LngLatHeightObject = {\n  longitude: number;\n  latitude: number;\n  height: number;\n};\n\ntype XYZObject = {\n  x: number;\n  y: number;\n  z: number;\n};\n\ntype Cartographic = LngLatHeightObject | XYZObject | NumericArray;\n\nconst noop = (x) => x;\n\nconst scratchVector = new Vector3();\n\nexport function fromCartographic(cartographic: Cartographic): number[];\nexport function fromCartographic<NumArrayT>(\n  cartographic: Cartographic,\n  result: NumArrayT,\n  map: any\n): NumArrayT;\nexport function fromCartographic(cartographic, result = [-0, -0, -0], map = noop) {\n  if (isArray(cartographic)) {\n    result[0] = map(cartographic[0]);\n    result[1] = map(cartographic[1]);\n    result[2] = cartographic[2];\n  } else if ('longitude' in cartographic) {\n    result[0] = map(cartographic.longitude);\n    result[1] = map(cartographic.latitude);\n    result[2] = cartographic.height;\n  } else {\n    result[0] = map(cartographic.x);\n    result[1] = map(cartographic.y);\n    result[2] = cartographic.z;\n  }\n  return result;\n}\n\nexport function fromCartographicToRadians(cartographic: Cartographic, result?: number[]): number[];\nexport function fromCartographicToRadians<TArray>(\n  cartographic: Cartographic,\n  result: TArray\n): TArray;\nexport function fromCartographicToRadians(cartographic, vector = []) {\n  return fromCartographic(cartographic, vector, config._cartographicRadians ? noop : toRadians);\n}\n\nexport function fromCartographicToDegrees(cartographic: Cartographic, result?: number[]): number[];\nexport function fromCartographicToDegrees<TArray>(\n  cartographic: Cartographic,\n  result: TArray\n): TArray;\nexport function fromCartographicToDegrees(cartographic, vector = []) {\n  return fromCartographic(cartographic, vector, config._cartographicRadians ? toDegrees : noop);\n}\n\nexport function toCartographic(\n  vector: Readonly<NumericArray>,\n  result: Cartographic,\n  map: any\n): number[];\nexport function toCartographic(vector, cartographic, map = noop) {\n  if (isArray(cartographic)) {\n    cartographic[0] = map(vector[0]);\n    cartographic[1] = map(vector[1]);\n    cartographic[2] = vector[2];\n  } else if ('longitude' in cartographic) {\n    cartographic.longitude = map(vector[0]);\n    cartographic.latitude = map(vector[1]);\n    cartographic.height = vector[2];\n  } else {\n    cartographic.x = map(vector[0]);\n    cartographic.y = map(vector[1]);\n    cartographic.z = vector[2];\n  }\n  return cartographic;\n}\n\nexport function toCartographicFromRadians(\n  vector: Readonly<NumericArray>,\n  cartographic: Cartographic\n): number[] {\n  return toCartographic(vector, cartographic, config._cartographicRadians ? noop : toDegrees);\n}\n\nexport function toCartographicFromDegrees(\n  vector: Readonly<NumericArray>,\n  cartographic: Cartographic\n): number[] {\n  return toCartographic(vector, cartographic, config._cartographicRadians ? toRadians : noop);\n}\n\n// Estimates if a vector is close to the surface of the WGS84 Ellipsoid\nexport function isWGS84(vector: Readonly<NumericArray>): boolean {\n  if (!vector) {\n    return false;\n  }\n  scratchVector.from(vector);\n  const {oneOverRadiiSquared, centerToleranceSquared} = WGS84_CONSTANTS;\n  const x2 = vector[0] * vector[0] * oneOverRadiiSquared[0];\n  const y2 = vector[1] * vector[1] * oneOverRadiiSquared[1];\n  const z2 = vector[2] * vector[2] * oneOverRadiiSquared[2];\n  return Math.abs(x2 + y2 + z2 - 1) < centerToleranceSquared;\n}\n\n/*\n\nexport function fromCartographic(cartographic: Cartographic, result?: number[]): number[];\nexport function fromCartographic(cartographic: Cartographic, result: TypedArray): TypedArray;\nexport function fromCartographicToRadians(cartographic: Cartographic, result?: number[]): number[];\nexport function fromCartographicToRadians(\n  cartographic: Cartographic,\n  result: TypedArray\n): TypedArray;\nexport function fromCartographicToDegrees(cartographic: Cartographic, result?: number[]): number[];\nexport function fromCartographicToDegrees(\n  cartographic: Cartographic,\n  result: TypedArray\n): TypedArray;\n\nexport function toCartographic(vector: number[] | TypedArray, result: Cartographic): number[];\nexport function toCartographicFromRadians(\n  vector: number[] | TypedArray,\n  result: Cartographic\n): number[];\nexport function toCartographicFromDegrees(\n  vector: number[] | TypedArray,\n  result: Cartographic\n): number[];\n\n// Estimates if a vector is close to the surface of the WGS84 Ellipsoid\nexport function isWGS84(vector: number[] | TypedArray): boolean;\n*/\n"],"file":"type-utils.js"}
+{"version":3,"sources":["../../src/type-utils.ts"],"names":["Vector3","toRadians","toDegrees","config","WGS84_CONSTANTS","identity","x","scratchVector","fromCartographic","cartographic","result","map","longitude","latitude","height","y","z","fromCartographicToRadians","vector","_cartographicRadians","fromCartographicToDegrees","toCartographic","toCartographicFromRadians","toCartographicFromDegrees","isWGS84","from","oneOverRadiiSquared","centerToleranceSquared","x2","y2","z2","Math","abs"],"mappings":"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","sourcesContent":["// This file is derived from the Cesium math library under Apache 2 license\n// See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md\n\nimport type {NumericArray} from '@math.gl/core';\nimport {Vector3, toRadians, toDegrees, config} from '@math.gl/core';\nimport {WGS84_CONSTANTS} from './constants';\n\ntype LngLatHeightObject = {\n  longitude: number;\n  latitude: number;\n  height: number;\n};\n\ntype XYZObject = {\n  x: number;\n  y: number;\n  z: number;\n};\n\ntype Cartographic = LngLatHeightObject | XYZObject | NumericArray;\n\nfunction identity(x: number): number {\n  return x;\n}\n\nconst scratchVector = new Vector3();\n\nexport function fromCartographic(cartographic: Cartographic): number[];\nexport function fromCartographic<NumArrayT>(\n  cartographic: Cartographic,\n  result: NumArrayT,\n  map?: (x: number) => number\n): NumArrayT;\nexport function fromCartographic(\n  cartographic: Cartographic,\n  result = [] as number[],\n  map = identity\n): number[] {\n  if ('longitude' in cartographic) {\n    result[0] = map(cartographic.longitude);\n    result[1] = map(cartographic.latitude);\n    result[2] = cartographic.height;\n  } else if ('x' in cartographic) {\n    result[0] = map(cartographic.x);\n    result[1] = map(cartographic.y);\n    result[2] = cartographic.z;\n  } else {\n    result[0] = map(cartographic[0]);\n    result[1] = map(cartographic[1]);\n    result[2] = cartographic[2];\n  }\n  return result;\n}\n\nexport function fromCartographicToRadians(cartographic: Cartographic, result?: number[]): number[];\nexport function fromCartographicToRadians<TArray>(\n  cartographic: Cartographic,\n  result: TArray\n): TArray;\nexport function fromCartographicToRadians(\n  cartographic: Cartographic,\n  vector = [] as number[]\n): number[] {\n  return fromCartographic(cartographic, vector, config._cartographicRadians ? identity : toRadians);\n}\n\nexport function fromCartographicToDegrees(cartographic: Cartographic, result?: number[]): number[];\nexport function fromCartographicToDegrees<TArray>(\n  cartographic: Cartographic,\n  result: TArray\n): TArray;\nexport function fromCartographicToDegrees(\n  cartographic: Cartographic,\n  vector = [] as number[]\n): number[] {\n  return fromCartographic(cartographic, vector, config._cartographicRadians ? toDegrees : identity);\n}\n\nexport function toCartographic<T extends Cartographic>(\n  vector: Readonly<NumericArray>,\n  cartographic: T,\n  map: (x: number) => number = identity\n): T {\n  if ('longitude' in cartographic) {\n    cartographic.longitude = map(vector[0]);\n    cartographic.latitude = map(vector[1]);\n    cartographic.height = vector[2];\n  } else if ('x' in cartographic) {\n    cartographic.x = map(vector[0]);\n    cartographic.y = map(vector[1]);\n    cartographic.z = vector[2];\n  } else {\n    cartographic[0] = map(vector[0]);\n    cartographic[1] = map(vector[1]);\n    cartographic[2] = vector[2];\n  }\n  return cartographic;\n}\n\nexport function toCartographicFromRadians<T extends Cartographic>(\n  vector: Readonly<NumericArray>,\n  cartographic: T\n): T {\n  return toCartographic(vector, cartographic, config._cartographicRadians ? identity : toDegrees);\n}\n\nexport function toCartographicFromDegrees<T extends Cartographic>(\n  vector: Readonly<NumericArray>,\n  cartographic: T\n): T {\n  return toCartographic(vector, cartographic, config._cartographicRadians ? toRadians : identity);\n}\n\n// Estimates if a vector is close to the surface of the WGS84 Ellipsoid\nexport function isWGS84(vector: Readonly<NumericArray>): boolean {\n  if (!vector) {\n    return false;\n  }\n  scratchVector.from(vector);\n  const {oneOverRadiiSquared, centerToleranceSquared} = WGS84_CONSTANTS;\n  const x2 = vector[0] * vector[0] * oneOverRadiiSquared[0];\n  const y2 = vector[1] * vector[1] * oneOverRadiiSquared[1];\n  const z2 = vector[2] * vector[2] * oneOverRadiiSquared[2];\n  return Math.abs(x2 + y2 + z2 - 1) < centerToleranceSquared;\n}\n\n/*\n\nexport function fromCartographic(cartographic: Cartographic, result?: number[]): number[];\nexport function fromCartographic(cartographic: Cartographic, result: TypedArray): TypedArray;\nexport function fromCartographicToRadians(cartographic: Cartographic, result?: number[]): number[];\nexport function fromCartographicToRadians(\n  cartographic: Cartographic,\n  result: TypedArray\n): TypedArray;\nexport function fromCartographicToDegrees(cartographic: Cartographic, result?: number[]): number[];\nexport function fromCartographicToDegrees(\n  cartographic: Cartographic,\n  result: TypedArray\n): TypedArray;\n\nexport function toCartographic(vector: number[] | TypedArray, result: Cartographic): number[];\nexport function toCartographicFromRadians(\n  vector: number[] | TypedArray,\n  result: Cartographic\n): number[];\nexport function toCartographicFromDegrees(\n  vector: number[] | TypedArray,\n  result: Cartographic\n): number[];\n\n// Estimates if a vector is close to the surface of the WGS84 Ellipsoid\nexport function isWGS84(vector: number[] | TypedArray): boolean;\n*/\n"],"file":"type-utils.js"}

package/dist/type-utils.d.ts

@@ -1,4 +1,4 @@
-import { NumericArray } from '@math.gl/types';
+import type { NumericArray } from '@math.gl/core';
 declare type LngLatHeightObject = {
     longitude: number;
     latitude: number;
@@ -11,14 +11,14 @@ declare type XYZObject = {
 };
 declare type Cartographic = LngLatHeightObject | XYZObject | NumericArray;
 export declare function fromCartographic(cartographic: Cartographic): number[];
-export declare function fromCartographic<NumArrayT>(cartographic: Cartographic, result: NumArrayT, map: any): NumArrayT;
+export declare function fromCartographic<NumArrayT>(cartographic: Cartographic, result: NumArrayT, map?: (x: number) => number): NumArrayT;
 export declare function fromCartographicToRadians(cartographic: Cartographic, result?: number[]): number[];
 export declare function fromCartographicToRadians<TArray>(cartographic: Cartographic, result: TArray): TArray;
 export declare function fromCartographicToDegrees(cartographic: Cartographic, result?: number[]): number[];
 export declare function fromCartographicToDegrees<TArray>(cartographic: Cartographic, result: TArray): TArray;
-export declare function toCartographic(vector: Readonly<NumericArray>, result: Cartographic, map: any): number[];
-export declare function toCartographicFromRadians(vector: Readonly<NumericArray>, cartographic: Cartographic): number[];
-export declare function toCartographicFromDegrees(vector: Readonly<NumericArray>, cartographic: Cartographic): number[];
+export declare function toCartographic<T extends Cartographic>(vector: Readonly<NumericArray>, cartographic: T, map?: (x: number) => number): T;
+export declare function toCartographicFromRadians<T extends Cartographic>(vector: Readonly<NumericArray>, cartographic: T): T;
+export declare function toCartographicFromDegrees<T extends Cartographic>(vector: Readonly<NumericArray>, cartographic: T): T;
 export declare function isWGS84(vector: Readonly<NumericArray>): boolean;
 export {};
 //# sourceMappingURL=type-utils.d.ts.map

package/dist/type-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type-utils.d.ts","sourceRoot":"","sources":["../src/type-utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAI5C,aAAK,kBAAkB,GAAG;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,aAAK,SAAS,GAAG;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAEF,aAAK,YAAY,GAAG,kBAAkB,GAAG,SAAS,GAAG,YAAY,CAAC;AAMlE,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,EAAE,CAAC;AACvE,wBAAgB,gBAAgB,CAAC,SAAS,EACxC,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,SAAS,EACjB,GAAG,EAAE,GAAG,GACP,SAAS,CAAC;AAkBb,wBAAgB,yBAAyB,CAAC,YAAY,EAAE,YAAY,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;AACnG,wBAAgB,yBAAyB,CAAC,MAAM,EAC9C,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,GACb,MAAM,CAAC;AAKV,wBAAgB,yBAAyB,CAAC,YAAY,EAAE,YAAY,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;AACnG,wBAAgB,yBAAyB,CAAC,MAAM,EAC9C,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,GACb,MAAM,CAAC;AAKV,wBAAgB,cAAc,CAC5B,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,EAC9B,MAAM,EAAE,YAAY,EACpB,GAAG,EAAE,GAAG,GACP,MAAM,EAAE,CAAC;AAkBZ,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,EAC9B,YAAY,EAAE,YAAY,GACzB,MAAM,EAAE,CAEV;AAED,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,EAC9B,YAAY,EAAE,YAAY,GACzB,MAAM,EAAE,CAEV;AAGD,wBAAgB,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,GAAG,OAAO,CAU/D"}
+{"version":3,"file":"type-utils.d.ts","sourceRoot":"","sources":["../src/type-utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAIhD,aAAK,kBAAkB,GAAG;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,aAAK,SAAS,GAAG;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAEF,aAAK,YAAY,GAAG,kBAAkB,GAAG,SAAS,GAAG,YAAY,CAAC;AAQlE,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,EAAE,CAAC;AACvE,wBAAgB,gBAAgB,CAAC,SAAS,EACxC,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,SAAS,EACjB,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,GAC1B,SAAS,CAAC;AAsBb,wBAAgB,yBAAyB,CAAC,YAAY,EAAE,YAAY,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;AACnG,wBAAgB,yBAAyB,CAAC,MAAM,EAC9C,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,GACb,MAAM,CAAC;AAQV,wBAAgB,yBAAyB,CAAC,YAAY,EAAE,YAAY,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;AACnG,wBAAgB,yBAAyB,CAAC,MAAM,EAC9C,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,GACb,MAAM,CAAC;AAQV,wBAAgB,cAAc,CAAC,CAAC,SAAS,YAAY,EACnD,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,EAC9B,YAAY,EAAE,CAAC,EACf,GAAG,GAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAiB,GACpC,CAAC,CAeH;AAED,wBAAgB,yBAAyB,CAAC,CAAC,SAAS,YAAY,EAC9D,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,EAC9B,YAAY,EAAE,CAAC,GACd,CAAC,CAEH;AAED,wBAAgB,yBAAyB,CAAC,CAAC,SAAS,YAAY,EAC9D,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,EAC9B,YAAY,EAAE,CAAC,GACd,CAAC,CAEH;AAGD,wBAAgB,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,GAAG,OAAO,CAU/D"}

package/dist/type-utils.js

@@ -1,56 +1,58 @@
 // This file is derived from the Cesium math library under Apache 2 license
 // See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md
-import { Vector3, isArray, toRadians, toDegrees, config } from '@math.gl/core';
+import { Vector3, toRadians, toDegrees, config } from '@math.gl/core';
 import { WGS84_CONSTANTS } from './constants';
-const noop = (x) => x;
+function identity(x) {
+    return x;
+}
 const scratchVector = new Vector3();
-export function fromCartographic(cartographic, result = [-0, -0, -0], map = noop) {
-    if (isArray(cartographic)) {
-        result[0] = map(cartographic[0]);
-        result[1] = map(cartographic[1]);
-        result[2] = cartographic[2];
-    }
-    else if ('longitude' in cartographic) {
+export function fromCartographic(cartographic, result = [], map = identity) {
+    if ('longitude' in cartographic) {
         result[0] = map(cartographic.longitude);
         result[1] = map(cartographic.latitude);
         result[2] = cartographic.height;
     }
-    else {
+    else if ('x' in cartographic) {
         result[0] = map(cartographic.x);
         result[1] = map(cartographic.y);
         result[2] = cartographic.z;
     }
+    else {
+        result[0] = map(cartographic[0]);
+        result[1] = map(cartographic[1]);
+        result[2] = cartographic[2];
+    }
     return result;
 }
 export function fromCartographicToRadians(cartographic, vector = []) {
-    return fromCartographic(cartographic, vector, config._cartographicRadians ? noop : toRadians);
+    return fromCartographic(cartographic, vector, config._cartographicRadians ? identity : toRadians);
 }
 export function fromCartographicToDegrees(cartographic, vector = []) {
-    return fromCartographic(cartographic, vector, config._cartographicRadians ? toDegrees : noop);
+    return fromCartographic(cartographic, vector, config._cartographicRadians ? toDegrees : identity);
 }
-export function toCartographic(vector, cartographic, map = noop) {
-    if (isArray(cartographic)) {
-        cartographic[0] = map(vector[0]);
-        cartographic[1] = map(vector[1]);
-        cartographic[2] = vector[2];
-    }
-    else if ('longitude' in cartographic) {
+export function toCartographic(vector, cartographic, map = identity) {
+    if ('longitude' in cartographic) {
         cartographic.longitude = map(vector[0]);
         cartographic.latitude = map(vector[1]);
         cartographic.height = vector[2];
     }
-    else {
+    else if ('x' in cartographic) {
         cartographic.x = map(vector[0]);
         cartographic.y = map(vector[1]);
         cartographic.z = vector[2];
     }
+    else {
+        cartographic[0] = map(vector[0]);
+        cartographic[1] = map(vector[1]);
+        cartographic[2] = vector[2];
+    }
     return cartographic;
 }
 export function toCartographicFromRadians(vector, cartographic) {
-    return toCartographic(vector, cartographic, config._cartographicRadians ? noop : toDegrees);
+    return toCartographic(vector, cartographic, config._cartographicRadians ? identity : toDegrees);
 }
 export function toCartographicFromDegrees(vector, cartographic) {
-    return toCartographic(vector, cartographic, config._cartographicRadians ? toRadians : noop);
+    return toCartographic(vector, cartographic, config._cartographicRadians ? toRadians : identity);
 }
 // Estimates if a vector is close to the surface of the WGS84 Ellipsoid
 export function isWGS84(vector) {

package/package.json

@@ -5,7 +5,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "3.6.0-alpha.1",
+  "version": "3.6.0-alpha.2",
   "keywords": [
     "webgl",
     "javascript",
@@ -32,8 +32,8 @@
   ],
   "dependencies": {
     "@babel/runtime": "^7.12.0",
-    "@math.gl/core": "3.6.0-alpha.1",
-    "gl-matrix": "~3.3.0"
+    "@math.gl/core": "3.6.0-alpha.2",
+    "gl-matrix": "^3.4.0"
   },
-  "gitHead": "45386981340895bf201c2ebb76257c9bbffd8ff6"
+  "gitHead": "ea7dc265c98b68af56218302d1d42b7d65f74ccb"
 }

package/src/ellipsoid/ellipsoid.ts

@@ -36,7 +36,7 @@ let wgs84;
  */
 export default class Ellipsoid {
   /** An Ellipsoid instance initialized to the WGS84 standard. */
-  static readonly WGS84 = new Ellipsoid(WGS84_RADIUS_X, WGS84_RADIUS_Y, WGS84_RADIUS_Z);
+  static readonly WGS84: Ellipsoid = new Ellipsoid(WGS84_RADIUS_X, WGS84_RADIUS_Y, WGS84_RADIUS_Z);
 
   readonly radii: Vector3;
   readonly radiiSquared: Vector3;
@@ -212,15 +212,13 @@ export default class Ellipsoid {
   /** Scales the provided Cartesian position along the geodetic surface normal
    * so that it is on the surface of this ellipsoid.  If the position is
    * at the center of the ellipsoid, this function returns undefined. */
-  scaleToGeodeticSurface(cartesian: number[], result?: number[]): number[];
-  scaleToGeodeticSurface(cartesian, result) {
+  scaleToGeodeticSurface(cartesian: number[], result?: number[]): number[] {
     return scaleToGeodeticSurface(cartesian, this, result);
   }
 
   /** Scales the provided Cartesian position along the geocentric surface normal
    * so that it is on the surface of this ellipsoid. */
-  scaleToGeocentricSurface(cartesian: number[], result?: number[]): number[];
-  scaleToGeocentricSurface(cartesian, result = [0, 0, 0]) {
+  scaleToGeocentricSurface(cartesian: number[], result: number[] = [0, 0, 0]): number[] {
     scratchPosition.from(cartesian);
 
     const positionX = scratchPosition.x;
@@ -241,25 +239,22 @@ export default class Ellipsoid {
 
   /** Transforms a Cartesian X, Y, Z position to the ellipsoid-scaled space by multiplying
    * its components by the result of `Ellipsoid#oneOverRadii` */
-  transformPositionToScaledSpace(position: number[], result?: number[]): number[];
-  transformPositionToScaledSpace(position, result = [0, 0, 0]) {
+  transformPositionToScaledSpace(position: number[], result: number[] = [0, 0, 0]): number[] {
     return scratchPosition.from(position).scale(this.oneOverRadii).to(result);
   }
 
   /** Transforms a Cartesian X, Y, Z position from the ellipsoid-scaled space by multiplying
    * its components by the result of `Ellipsoid#radii`. */
-  transformPositionFromScaledSpace(position: number[], result?: number[]): number[];
-  transformPositionFromScaledSpace(position, result = [0, 0, 0]) {
+  transformPositionFromScaledSpace(position: number[], result: number[] = [0, 0, 0]): number[] {
     return scratchPosition.from(position).scale(this.radii).to(result);
   }
 
   /** Computes a point which is the intersection of the surface normal with the z-axis. */
   getSurfaceNormalIntersectionWithZAxis(
     position: number[],
-    buffer?: number,
-    result?: number[]
-  ): number[];
-  getSurfaceNormalIntersectionWithZAxis(position, buffer = 0.0, result = [0, 0, 0]) {
+    buffer: number = 0,
+    result: number[] = [0, 0, 0]
+  ): number[] {
     // Ellipsoid must be an ellipsoid of revolution (radii.x == radii.y)
     assert(equals(this.radii.x, this.radii.y, _MathUtils.EPSILON15));
     assert(this.radii.z > 0);

package/src/ellipsoid/helpers/ellipsoid-transform.ts

@@ -1,5 +1,7 @@
 import {Vector3, assert, equals as equalsEpsilon} from '@math.gl/core';
 
+import type Ellipsoid from '../ellipsoid';
+
 const EPSILON14 = 1e-14;
 
 const scratchOrigin = new Vector3();
@@ -42,7 +44,7 @@ const VECTOR_PRODUCT_LOCAL_FRAME = {
     north: 'up',
     south: 'down'
   }
-};
+} as const;
 
 const degeneratePositionLocalFrame = {
   north: [-1, 0, 0],
@@ -51,7 +53,7 @@ const degeneratePositionLocalFrame = {
   south: [1, 0, 0],
   west: [0, -1, 0],
   down: [0, 0, -1]
-};
+} as const;
 
 const scratchAxisVectors = {
   east: new Vector3(),
@@ -66,25 +68,28 @@ const scratchVector1 = new Vector3();
 const scratchVector2 = new Vector3();
 const scratchVector3 = new Vector3();
 
+type Axis = 'up' | 'down' | 'north' | 'east' | 'south' | 'west';
+
 // Computes a 4x4 transformation matrix from a reference frame
 // centered at the provided origin to the provided ellipsoid's fixed reference frame.
 // eslint-disable-next-line max-statements, max-params, complexity
 export default function localFrameToFixedFrame(
-  ellipsoid,
-  firstAxis,
-  secondAxis,
-  thirdAxis,
-  cartesianOrigin,
-  result
-) {
+  ellipsoid: Ellipsoid,
+  firstAxis: Axis,
+  secondAxis: Axis,
+  thirdAxis: Axis,
+  cartesianOrigin: number[],
+  result: number[]
+): number[] {
   const thirdAxisInferred =
-    VECTOR_PRODUCT_LOCAL_FRAME[firstAxis] && VECTOR_PRODUCT_LOCAL_FRAME[firstAxis][secondAxis];
+    VECTOR_PRODUCT_LOCAL_FRAME[firstAxis] &&
+    (VECTOR_PRODUCT_LOCAL_FRAME[firstAxis][secondAxis] as Axis);
   // firstAxis and secondAxis must be east, north, up, west, south or down.');
   assert(thirdAxisInferred && (!thirdAxis || thirdAxis === thirdAxisInferred));
 
-  let firstAxisVector;
-  let secondAxisVector;
-  let thirdAxisVector;
+  let firstAxisVector: Vector3;
+  let secondAxisVector: Vector3;
+  let thirdAxisVector: Vector3;
 
   const origin = scratchOrigin.copy(cartesianOrigin);
 

package/src/ellipsoid/helpers/scale-to-geodetic-surface.ts

@@ -1,6 +1,6 @@
 /* eslint-disable */
-import {Vector3, assert, _MathUtils} from '@math.gl/core';
-import * as vec3 from 'gl-matrix/vec3';
+import {Vector3, _MathUtils} from '@math.gl/core';
+import type Ellipsoid from '../ellipsoid';
 
 const scratchVector = new Vector3();
 const scaleToGeodeticSurfaceIntersection = new Vector3();
@@ -9,14 +9,18 @@ const scaleToGeodeticSurfaceGradient = new Vector3();
 // Scales the provided Cartesian position along the geodetic surface normal
 // so that it is on the surface of this ellipsoid.  If the position is
 // at the center of the ellipsoid, this function returns undefined.
-export default function scaleToGeodeticSurface(cartesian, ellipsoid, result = new Vector3()) {
+export default function scaleToGeodeticSurface(
+  cartesian: number[],
+  ellipsoid: Ellipsoid,
+  result: number[] = []
+): number[] {
   const {oneOverRadii, oneOverRadiiSquared, centerToleranceSquared} = ellipsoid;
 
   scratchVector.from(cartesian);
 
-  const positionX = cartesian.x;
-  const positionY = cartesian.y;
-  const positionZ = cartesian.z;
+  const positionX = scratchVector.x;
+  const positionY = scratchVector.y;
+  const positionZ = scratchVector.z;
 
   const oneOverRadiiX = oneOverRadii.x;
   const oneOverRadiiY = oneOverRadii.y;
@@ -58,7 +62,7 @@ export default function scaleToGeodeticSurface(cartesian, ellipsoid, result = ne
   );
 
   // Compute the initial guess at the normal vector multiplier, lambda.
-  let lambda = ((1.0 - ratio) * cartesian.len()) / (0.5 * gradient.len());
+  let lambda = ((1.0 - ratio) * scratchVector.len()) / (0.5 * gradient.len());
   let correction = 0.0;
 
   let xMultiplier;

package/src/type-utils.ts

@@ -1,8 +1,8 @@
 // This file is derived from the Cesium math library under Apache 2 license
 // See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md
 
-import {NumericArray} from '@math.gl/types';
-import {Vector3, isArray, toRadians, toDegrees, config} from '@math.gl/core';
+import type {NumericArray} from '@math.gl/core';
+import {Vector3, toRadians, toDegrees, config} from '@math.gl/core';
 import {WGS84_CONSTANTS} from './constants';
 
 type LngLatHeightObject = {
@@ -19,7 +19,9 @@ type XYZObject = {
 
 type Cartographic = LngLatHeightObject | XYZObject | NumericArray;
 
-const noop = (x) => x;
+function identity(x: number): number {
+  return x;
+}
 
 const scratchVector = new Vector3();
 
@@ -27,21 +29,25 @@ export function fromCartographic(cartographic: Cartographic): number[];
 export function fromCartographic<NumArrayT>(
   cartographic: Cartographic,
   result: NumArrayT,
-  map: any
+  map?: (x: number) => number
 ): NumArrayT;
-export function fromCartographic(cartographic, result = [-0, -0, -0], map = noop) {
-  if (isArray(cartographic)) {
-    result[0] = map(cartographic[0]);
-    result[1] = map(cartographic[1]);
-    result[2] = cartographic[2];
-  } else if ('longitude' in cartographic) {
+export function fromCartographic(
+  cartographic: Cartographic,
+  result = [] as number[],
+  map = identity
+): number[] {
+  if ('longitude' in cartographic) {
     result[0] = map(cartographic.longitude);
     result[1] = map(cartographic.latitude);
     result[2] = cartographic.height;
-  } else {
+  } else if ('x' in cartographic) {
     result[0] = map(cartographic.x);
     result[1] = map(cartographic.y);
     result[2] = cartographic.z;
+  } else {
+    result[0] = map(cartographic[0]);
+    result[1] = map(cartographic[1]);
+    result[2] = cartographic[2];
   }
   return result;
 }
@@ -51,8 +57,11 @@ export function fromCartographicToRadians<TArray>(
   cartographic: Cartographic,
   result: TArray
 ): TArray;
-export function fromCartographicToRadians(cartographic, vector = []) {
-  return fromCartographic(cartographic, vector, config._cartographicRadians ? noop : toRadians);
+export function fromCartographicToRadians(
+  cartographic: Cartographic,
+  vector = [] as number[]
+): number[] {
+  return fromCartographic(cartographic, vector, config._cartographicRadians ? identity : toRadians);
 }
 
 export function fromCartographicToDegrees(cartographic: Cartographic, result?: number[]): number[];
@@ -60,44 +69,46 @@ export function fromCartographicToDegrees<TArray>(
   cartographic: Cartographic,
   result: TArray
 ): TArray;
-export function fromCartographicToDegrees(cartographic, vector = []) {
-  return fromCartographic(cartographic, vector, config._cartographicRadians ? toDegrees : noop);
+export function fromCartographicToDegrees(
+  cartographic: Cartographic,
+  vector = [] as number[]
+): number[] {
+  return fromCartographic(cartographic, vector, config._cartographicRadians ? toDegrees : identity);
 }
 
-export function toCartographic(
+export function toCartographic<T extends Cartographic>(
   vector: Readonly<NumericArray>,
-  result: Cartographic,
-  map: any
-): number[];
-export function toCartographic(vector, cartographic, map = noop) {
-  if (isArray(cartographic)) {
-    cartographic[0] = map(vector[0]);
-    cartographic[1] = map(vector[1]);
-    cartographic[2] = vector[2];
-  } else if ('longitude' in cartographic) {
+  cartographic: T,
+  map: (x: number) => number = identity
+): T {
+  if ('longitude' in cartographic) {
     cartographic.longitude = map(vector[0]);
     cartographic.latitude = map(vector[1]);
     cartographic.height = vector[2];
-  } else {
+  } else if ('x' in cartographic) {
     cartographic.x = map(vector[0]);
     cartographic.y = map(vector[1]);
     cartographic.z = vector[2];
+  } else {
+    cartographic[0] = map(vector[0]);
+    cartographic[1] = map(vector[1]);
+    cartographic[2] = vector[2];
   }
   return cartographic;
 }
 
-export function toCartographicFromRadians(
+export function toCartographicFromRadians<T extends Cartographic>(
   vector: Readonly<NumericArray>,
-  cartographic: Cartographic
-): number[] {
-  return toCartographic(vector, cartographic, config._cartographicRadians ? noop : toDegrees);
+  cartographic: T
+): T {
+  return toCartographic(vector, cartographic, config._cartographicRadians ? identity : toDegrees);
 }
 
-export function toCartographicFromDegrees(
+export function toCartographicFromDegrees<T extends Cartographic>(
   vector: Readonly<NumericArray>,
-  cartographic: Cartographic
-): number[] {
-  return toCartographic(vector, cartographic, config._cartographicRadians ? toRadians : noop);
+  cartographic: T
+): T {
+  return toCartographic(vector, cartographic, config._cartographicRadians ? toRadians : identity);
 }
 
 // Estimates if a vector is close to the surface of the WGS84 Ellipsoid