@openglobus/og 0.17.1 → 0.18.0

package/src/{og/math.js → math.ts}

@@ -1,8 +1,4 @@
-/**
- * @module og/math
- */
-
-"use strict";
+import {Vec3} from "./math/Vec3";
 
 /** @const */
 export const TWO_PI = 2.0 * Math.PI;
@@ -81,7 +77,7 @@ export const EPS20 = 1e-20;
  * log(64, 2)
  * //returns 6
  */
-export function log(n, base) {
+export function log(n: number, base: number): number {
     return Math.log(n) / Math.log(base);
 }
 
@@ -96,7 +92,7 @@ export function log(n, base) {
  * clamp(12, 1, 5)
  * //returns 5
  */
-export function clamp(number, min, max) {
+export function clamp(number: number, min: number, max: number): number {
     return Math.max(min, Math.min(number, max));
 }
 
@@ -106,7 +102,7 @@ export function clamp(number, min, max) {
  * @param {number} degrees - Degree value.
  * @returns {number} -
  */
-export function DEG2RAD(degrees) {
+export function DEG2RAD(degrees: number): number {
     return degrees * RADIANS;
 }
 
@@ -116,7 +112,7 @@ export function DEG2RAD(degrees) {
  * @param {number} angle - Degree value.
  * @returns {number} -
  */
-export function RAD2DEG(angle) {
+export function RAD2DEG(angle: number): number {
     return angle * DEGREES;
 }
 
@@ -126,7 +122,7 @@ export function RAD2DEG(angle) {
  * @param {number} x - Input value.
  * @returns {boolean} -
  */
-export function isPowerOfTwo(x) {
+export function isPowerOfTwo(x: number): boolean {
     return (x & (x - 1)) === 0;
 }
 
@@ -134,9 +130,10 @@ export function isPowerOfTwo(x) {
  * Returns next value that is power of two.
  * @function
  * @param {number} x - Input value.
+ * @param {number} [maxValue=4096] - Maximal value.
  * @returns {number} -
  */
-export function nextHighestPowerOfTwo(x, maxValue = 4096) {
+export function nextHighestPowerOfTwo(x: number, maxValue: number = 4096): number {
     --x;
     for (let i = 1; i < 32; i <<= 1) {
         x = x | (x >> i);
@@ -151,7 +148,7 @@ export function nextHighestPowerOfTwo(x, maxValue = 4096) {
  * @param {number} max - Maximal bound.
  * @returns {number} -
  */
-export function randomi(min = 0, max = 1) {
+export function randomi(min: number = 0, max: number = 1): number {
     return Math.floor(Math.random() * (max - min)) + min;
 }
 
@@ -162,7 +159,7 @@ export function randomi(min = 0, max = 1) {
  * @param {number} [max=1] - Maximal bound.
  * @returns {number} -
  */
-export function random(min = 0, max = 1) {
+export function random(min: number = 0, max: number = 1): number {
     return Math.random() * (max - min) + min;
 }
 
@@ -175,7 +172,7 @@ export function random(min = 0, max = 1) {
  * @param {boolean} [p] - Positive flag. False - default.
  * @returns {number} -
  **/
-export function degToDec(d, m, s, p) {
+export function degToDec(d: number, m: number, s: number, p: number): number {
     if (p) {
         return d + m / 60.0 + s / 3600.0;
     } else {
@@ -190,7 +187,7 @@ export function degToDec(d, m, s, p) {
  * @param {number} n - The divisor.
  * @returns {number} The remainder.
  */
-export function mod(m, n) {
+export function mod(m: number, n: number): number {
     return ((m % n) + n) % n;
 }
 
@@ -200,7 +197,7 @@ export function mod(m, n) {
  * @param {number} a - Angle in radians
  * @returns {number} -
  */
-export function zeroTwoPI(a) {
+export function zeroTwoPI(a: number): number {
     const res = mod(a, TWO_PI);
     if (Math.abs(res) < EPS14 && Math.abs(a) > EPS14) {
         return TWO_PI;
@@ -215,17 +212,17 @@ export function zeroTwoPI(a) {
  * @param {number} x - Value to edge.
  * @returns {number} -
  */
-export function step(edge, x) {
+export function step(edge: number, x: number): number {
     return x < edge ? 0.0 : 1.0;
 }
 
 /**
- * The fract function returns the fractional part of x, i.e. x minus floor(x).
+ * The frac function returns the fractional part of x, i.e. x minus floor(x).
  * @function
  * @param {number} x - Input value.
  * @returns {number} -
  */
-export function frac(x) {
+export function frac(x: number): number {
     const mx = Math.abs(x)
     return mx - Math.floor(mx);
 }
@@ -236,7 +233,7 @@ export function frac(x) {
  * @param {number} x - Input value.
  * @returns {number} -
  */
-export function log2(x) {
+export function log2(x: number): number {
     return Math.log(x) / LOG2;
 }
 
@@ -246,7 +243,7 @@ export function log2(x) {
  * @param {number} n - Power value.
  * @returns {number} -
  */
-export function exp2(n) {
+export function exp2(n: number): number {
     return Math.pow(2, n);
 }
 
@@ -256,7 +253,7 @@ export function exp2(n) {
  * @param {number} n - Integer power value.
  * @returns {number} -
  */
-export function pow2i(n) {
+export function pow2i(n: number): number {
     return 2 << (n - 1);
 }
 
@@ -267,7 +264,7 @@ export function pow2i(n) {
  * @param {number} h0 - Start value.
  * @returns {number} -
  */
-export function slice(t, h1, h0) {
+export function slice(t: number, h1: number, h0: number): number {
     return t * (h1 - h0);
 }
 
@@ -279,19 +276,19 @@ export function slice(t, h1, h0) {
  * @param {number} h0 - Start value.
  * @returns {number} -
  */
-export function lerp(t, h1, h0) {
+export function lerp(t: number, h1: number, h0: number): number {
     return h0 + t * (h1 - h0);
 }
 
-export function cube(f) {
+export function cube(f: number): number {
     return f * f * f;
 }
 
-export function square(f) {
+export function square(f: number): number {
     return f * f;
 }
 
-export function bezier1v(t, p0, p1, p2, p3) {
+export function bezier1v(t: number, p0: number, p1: number, p2: number, p3: number): number {
     return (
         cube(1 - t) * p0 + 3 * square(1 - t) * t * p1 + 3 * (1 - t) * square(t) * p2 + cube(t) * p3
     );
@@ -307,15 +304,15 @@ export function bezier1v(t, p0, p1, p2, p3) {
  * @param {Vec3} p3 - Fourth control point.
  * @returns {Vec3} -
  */
-export function bezier3v(t, p0, p1, p2, p3) {
-    var u = 1 - t;
-    var tt = t * t;
-    var uu = u * u;
-    var uuu = uu * u;
-    var ttt = tt * t;
-
-    return p0
-        .scaleTo(uuu)
+export function bezier3v(t: number, p0: Vec3, p1: Vec3, p2: Vec3, p3: Vec3): Vec3 {
+
+    let u = 1 - t;
+    let tt = t * t;
+    let uu = u * u;
+    let uuu = uu * u;
+    let ttt = tt * t;
+
+    return p0.scaleTo(uuu)
         .addA(p1.scaleTo(3 * uu * t))
         .addA(p2.scaleTo(3 * u * tt))
         .addA(p3.scaleTo(ttt));
@@ -327,7 +324,7 @@ export function bezier3v(t, p0, p1, p2, p3) {
  * @param {number} x - Input angle.
  * @returns {number} -
  */
-export function rev(x) {
+export function rev(x: number): number {
     return x - Math.floor(x / 360.0) * 360.0;
 }
 
@@ -337,7 +334,7 @@ export function rev(x) {
  * @param {number} lon - Longitude.
  * @returns {number} -
  */
-export function norm_lon(lon) {
+export function norm_lon(lon: number): number {
     return lon > 180 ? ((lon + 180) % 360) - 180 : lon < -180 ? ((lon - 180) % 360) + 180 : lon;
 }
 
@@ -347,21 +344,21 @@ export function norm_lon(lon) {
  * @param {number} a - Angle in radians.
  * @returns {number} -
  */
-export function negativePItoPI(a) {
+export function negativePItoPI(a: number): number {
     return zeroTwoPI(a + Math.PI) - Math.PI;
 }
 
 /**
  * Solve using iteration method and a fixed number of steps.
  * @function
- * @param {equationCallback} f - Equation. Used in Euler's equation(see og.orbit) solving.
+ * @param {Function} f - Equation. Used in Euler's equation(see og.orbit) solving.
  * @param {number} x0 - First approximation.
  * @param {number} maxIter - Maximum iterations.
  * @returns {number} -
  */
-export function solve_iteration_fixed(f, x0, maxIter) {
-    var x = 0;
-    var x2 = x0;
+export function solve_iteration_fixed(f: (x: number) => number, x0: number, maxIter: number): number {
+    let x = 0;
+    let x2 = x0;
     for (let i = 0; i < maxIter; i++) {
         x = x2;
         x2 = f(x);
@@ -373,15 +370,15 @@ export function solve_iteration_fixed(f, x0, maxIter) {
  * Solve using iteration; terminate when error is below err or the maximum
  * number of iterations is reached. Used in Euler's equation(see og.orbit) solving.
  * @function
- * @param {equationCallback} f - Equation.
+ * @param {(x: number) => number} f - Equation.
  * @param {number} x0 - First approximation.
  * @param {number} err - Maximal accepted error value.
  * @param {number} maxIter - Maximum iterations.
  * @returns {number} -
  */
-export function solve_iteration(f, x0, err, maxIter = 50) {
-    var x = 0;
-    var x2 = x0;
+export function solve_iteration(f: (x: number) => number, x0: number, err: number, maxIter: number = 50): number {
+    let x = 0;
+    let x2 = x0;
     for (let i = 0; i < maxIter; i++) {
         x = x2;
         x2 = f(x);
@@ -404,7 +401,7 @@ export function solve_iteration(f, x0, err, maxIter = 50) {
  * @param b - Second bearing angle
  * @returns {number}
  */
-function getAngleDirection(a, b) {
+function getAngleDirection(a: number, b: number): number {
     let a_y = Math.cos(a),
         a_x = Math.sin(a),
         b_y = Math.cos(b),
@@ -423,7 +420,7 @@ function getAngleDirection(a, b) {
  * @param {number} b - Second azimuth angle
  * @returns {number}
  */
-export function getAngleBetweenAzimuths(a, b) {
+export function getAngleBetweenAzimuths(a: number, b: number): number {
     a = zeroTwoPI(a);
     b = zeroTwoPI(b);
     return ((((a - b) % 360) + 360 + 180) % 360) - 180;

package/src/{og/mercator.js → mercator.ts}

@@ -1,149 +1,143 @@
-/**
- * @module og/mercator
- */
-
-'use strict';
-
-import { Extent } from "./Extent.js";
-import { LonLat } from './LonLat.js';
-
-/**
- * Mercator size.
- * @const
- * @type {number}
- */
-export const POLE = 20037508.34;
-
-export const POLE2 = POLE * 2.0;
-
-export const PI_BY_POLE = Math.PI / POLE;
-
-export const POLE_BY_PI = POLE / Math.PI;
-
-const HALF_PI = Math.PI * 0.5;
-
-export const POLE_BY_180 = POLE / 180.0;
-
-export const INV_POLE_BY_180 = 180.0 / POLE;
-
-const PI_BY_360 = Math.PI / 360.0;
-
-const PI_BY_180 = Math.PI / 180.0;
-
-const INV_PI_BY_180 = 180.0 / Math.PI;
-
-/**
- * Double mercator size.
- * @const
- * @type {number}
- */
-export const POLE_DOUBLE = 2.0 * POLE;
-
-/**
- * One by mercator double size.
- * @const
- * @type {number}
- */
-export const ONE_BY_POLE_DOUBLE = 1.0 / POLE_DOUBLE;
-
-export function forward(lonLat) {
-    return new LonLat(lonLat.lon * POLE / 180.0, Math.log(Math.tan((90.0 + lonLat.lat) * PI_BY_360)) * POLE_BY_PI, lonLat.height);
-}
-
-/**
- * Converts degrees longitude to mercator coordinate.
- * @function
- * @param {number} lon - Degrees geodetic longitude.
- * @returns {number} -
- */
-export function forward_lon(lon) {
-    return lon * POLE / 180.0;
-}
-
-/**
- * Converts degrees latitude to mercator coordinate.
- * @function
- * @param {number} lat - Degrees geodetic latitude.
- * @returns {number} -
- */
-export function forward_lat(lat) {
-    return Math.log(Math.tan((90.0 + lat) * PI_BY_360)) * POLE_BY_PI;
-}
-
-/**
- * Converts mercator longitude to degrees coordinate.
- * @function
- * @param {number} lon - Mercator longitude.
- * @returns {number} -
- */
-export function inverse_lon(lon) {
-    return 180 * lon / POLE;
-}
-
-/**
- * Converts mercator latitude to degrees coordinate.
- * @function
- * @param {number} lon - Mercator latitude.
- * @returns {number} -
- */
-export function inverse_lat(lat) {
-    return INV_PI_BY_180 * (2.0 * Math.atan(Math.exp(lat * PI_BY_POLE)) - HALF_PI);
-}
-
-/**
- * Returns mercator map tile grid horizontal coordinate index by geodetic 
- * longitude and zoom level. Where top left corner of the grid is 0 coordinate index.
- * @function
- * @param {number} lon - Geodetic degrees longitude.
- * @param {number} zoom - Zoom level.
- * @returns {number}
- */
-export function getTileX(lon, zoom) {
-    return Math.floor((lon + 180) / 360.0 * Math.pow(2, zoom));
-}
-
-/**
- * Returns mercator map tile grid vertical coordinate index by geodetic 
- * latitude and zoom level. Where top left corner of the grid is 0 coordinate index.
- * @function
- * @param {number} lat - Geodetic degrees latitude.
- * @param {number} zoom - Zoom level.
- * @returns {number}
- */
-export function getTileY(lat, zoom) {
-    return Math.floor((1.0 - Math.log(Math.tan(lat * PI_BY_180) + 1.0 / Math.cos(lat * PI_BY_180)) / Math.PI) * 0.5 * Math.pow(2, zoom));
-}
-
-/**
- * Converts geodetic coordinate array to mercator coordinate array.
- * @function
- * @param {Array.<LonLat>} lonLatArr - LonLat array to convert.
- * @returns {Array.<LonLat>}
- */
-export function forwardArray(lonlatArr) {
-    var res = [];
-    for (let i = 0; i < lonlatArr.length; i++) {
-        res.push(lonlatArr[i].forwardMercator());
-    }
-    return res;
-}
-
-export function getTileExtent(x, y, z) {
-    let size = POLE2 / Math.pow(2, z),
-        sw = new LonLat(-POLE + x * size, POLE - y * size - size);
-    return new Extent(sw, new LonLat(sw.lon + size, sw.lat + size));
-}
-
-/**
- * Max mercator latitude.
- * @const
- * @type {number}
- */
-export const MAX_LAT = inverse_lat(POLE);
-
-/**
- * Min mercator latitude.
- * @const
- * @type {number}
- */
-export const MIN_LAT = -MAX_LAT;
+import { Extent } from "./Extent";
+import { LonLat } from './LonLat';
+
+/**
+ * Mercator size.
+ * @const
+ * @type {number}
+ */
+export const POLE = 20037508.34;
+
+export const POLE2 = POLE * 2.0;
+
+export const PI_BY_POLE = Math.PI / POLE;
+
+export const POLE_BY_PI = POLE / Math.PI;
+
+const HALF_PI = Math.PI * 0.5;
+
+export const POLE_BY_180 = POLE / 180.0;
+
+export const INV_POLE_BY_180 = 180.0 / POLE;
+
+const PI_BY_360 = Math.PI / 360.0;
+
+const PI_BY_180 = Math.PI / 180.0;
+
+const INV_PI_BY_180 = 180.0 / Math.PI;
+
+/**
+ * Double mercator size.
+ * @const
+ * @type {number}
+ */
+export const POLE_DOUBLE = 2.0 * POLE;
+
+/**
+ * One by mercator double size.
+ * @const
+ * @type {number}
+ */
+export const ONE_BY_POLE_DOUBLE = 1.0 / POLE_DOUBLE;
+
+export function forward(lonLat: LonLat): LonLat {
+    return new LonLat(lonLat.lon * POLE / 180.0, Math.log(Math.tan((90.0 + lonLat.lat) * PI_BY_360)) * POLE_BY_PI, lonLat.height);
+}
+
+/**
+ * Converts degrees longitude to mercator coordinate.
+ * @function
+ * @param {number} lon - Degrees geodetic longitude.
+ * @returns {number} -
+ */
+export function forward_lon(lon: number): number {
+    return lon * POLE / 180.0;
+}
+
+/**
+ * Converts degrees latitude to mercator coordinate.
+ * @function
+ * @param {number} lat - Degrees geodetic latitude.
+ * @returns {number} -
+ */
+export function forward_lat(lat: number): number {
+    return Math.log(Math.tan((90.0 + lat) * PI_BY_360)) * POLE_BY_PI;
+}
+
+/**
+ * Converts mercator longitude to degrees coordinate.
+ * @function
+ * @param {number} lon - Mercator longitude.
+ * @returns {number} -
+ */
+export function inverse_lon(lon: number): number {
+    return 180 * lon / POLE;
+}
+
+/**
+ * Converts mercator latitude to degrees coordinate.
+ * @function
+ * @param {number} lon - Mercator latitude.
+ * @returns {number} -
+ */
+export function inverse_lat(lat: number): number {
+    return INV_PI_BY_180 * (2.0 * Math.atan(Math.exp(lat * PI_BY_POLE)) - HALF_PI);
+}
+
+/**
+ * Returns mercator map tile grid horizontal coordinate index by geodetic 
+ * longitude and zoom level. Where top left corner of the grid is 0 coordinate index.
+ * @function
+ * @param {number} lon - Geodetic degrees longitude.
+ * @param {number} zoom - Zoom level.
+ * @returns {number}
+ */
+export function getTileX(lon: number, zoom: number): number {
+    return Math.floor((lon + 180) / 360.0 * Math.pow(2, zoom));
+}
+
+/**
+ * Returns mercator map tile grid vertical coordinate index by geodetic 
+ * latitude and zoom level. Where top left corner of the grid is 0 coordinate index.
+ * @function
+ * @param {number} lat - Geodetic degrees latitude.
+ * @param {number} zoom - Zoom level.
+ * @returns {number}
+ */
+export function getTileY(lat: number, zoom: number): number {
+    return Math.floor((1.0 - Math.log(Math.tan(lat * PI_BY_180) + 1.0 / Math.cos(lat * PI_BY_180)) / Math.PI) * 0.5 * Math.pow(2, zoom));
+}
+
+/**
+ * Converts geodetic coordinate array to mercator coordinate array.
+ * @function
+ * @param {Array.<LonLat>} lonLatArr - LonLat array to convert.
+ * @returns {Array.<LonLat>}
+ */
+export function forwardArray(lonlatArr: LonLat[]): LonLat[] {
+    let res: LonLat[] = [];
+    for (let i = 0; i < lonlatArr.length; i++) {
+        res.push(lonlatArr[i].forwardMercator());
+    }
+    return res;
+}
+
+export function getTileExtent(x: number, y: number, z: number): Extent {
+    let size = POLE2 / Math.pow(2, z),
+        sw = new LonLat(-POLE + x * size, POLE - y * size - size);
+    return new Extent(sw, new LonLat(sw.lon + size, sw.lat + size));
+}
+
+/**
+ * Max mercator latitude.
+ * @const
+ * @type {number}
+ */
+export const MAX_LAT = inverse_lat(POLE);
+
+/**
+ * Min mercator latitude.
+ * @const
+ * @type {number}
+ */
+export const MIN_LAT = -MAX_LAT;

package/src/{og/proj/EPSG3857.js → proj/EPSG3857.ts}

@@ -2,9 +2,7 @@
  * @module og/proj/EPSG3857
  */
 
-"use strict";
-
-import { Proj, Units } from "./Proj.js";
+import { Proj, Units } from "./Proj";
 
 /**
  * EPSG:3857 projection object.

package/src/{og/proj/EPSG4326.js → proj/EPSG4326.ts}

@@ -1,13 +1,11 @@
-/**
- * @module og/proj/EPSG4326
- */
-
-"use strict";
-
-import { Proj, Units } from "./Proj.js";
-
-/**
- * EPSG:4326 projection object.
- * @type {Proj}
- */
-export const EPSG4326 = new Proj({ code: "epsg:4326", units: Units.DEGREES });
+/**
+ * @module og/proj/EPSG4326
+ */
+
+import { Proj, Units } from "./Proj";
+
+/**
+ * EPSG:4326 projection object.
+ * @type {Proj}
+ */
+export const EPSG4326 = new Proj({ code: "epsg:4326", units: Units.DEGREES });