@openglobus/og 0.11.1 → 0.11.6

package/src/og/math/Vec4.js

@@ -2,9 +2,10 @@
  * @module og/math/Vec4
  */
 
-'use strict';
+"use strict";
 
-import { Vec3 } from './Vec3.js';
+import { Vec3 } from "./Vec3.js";
+import { frac } from "../math.js";
 
 /**
  * Class represents a 4d vector.
@@ -15,9 +16,7 @@ import { Vec3 } from './Vec3.js';
  * @param {number} [w] - Fourth value.
  */
 export class Vec4 {
-
     constructor(x, y, z, w) {
-
         /**
          * @public
          * @type {number}
@@ -41,57 +40,59 @@ export class Vec4 {
          * @type {number}
          */
         this.w = w || 0.0;
-    };
+    }
 
     /**
      * Identity vector [0,0,0,1].
      * @const
-     * @type {og.math.Vec4}
+     * @type {Vec4}
      */
-    static get identity() { return new Vec4(0, 0, 0, 1) };
+    static get identity() {
+        return new Vec4(0, 0, 0, 1);
+    }
 
     /**
      * Creates 4d vector from array.
      * @function
-     * @param {Array.<number,number,number,number>}
-     * @returns {og.math.Vec4}
+     * @param {Array.<number>} - (exactly 4 entries)
+     * @returns {Vec4}
      */
     static fromVec(arr) {
         return new Vec4(arr[0], arr[1], arr[2], arr[3]);
-    };
+    }
 
     /**
      * Converts to 3d vector, without fourth value.
      * @public
-     * @returns {og.Vec3}
+     * @returns {Vec3}
      */
     toVec3() {
         return new Vec3(this.x, this.y, this.z);
-    };
+    }
 
     /**
      * Returns clone vector.
      * @public
-     * @returns {og.math.Vec4}
+     * @returns {Vec4}
      */
     clone(v) {
         return new Vec4(this.x, this.y, this.z, this.w);
-    };
+    }
 
     /**
      * Compares with vector. Returns true if it equals another.
      * @public
-     * @param {og.math.Vec4} p - Vector to compare.
+     * @param {Vec4} p - Vector to compare.
      * @returns {boolean}
      */
     equal(v) {
         return this.x === v.x && this.y === v.y && this.z === v.z && this.w === v.w;
-    };
+    }
 
     /**
      * Copy input vector's values.
-     * @param {og.math.Vec4} v - Vector to copy.
-     * @returns {og.math.Vec4}
+     * @param {Vec4} v - Vector to copy.
+     * @returns {Vec4}
      */
     copy(v) {
         this.x = v.x;
@@ -99,26 +100,26 @@ export class Vec4 {
         this.z = v.z;
         this.w = v.w;
         return this;
-    };
+    }
 
     /**
      * Converts vector to a number array.
      * @public
-     * @returns {Array.<number,number,number,number>}
+     * @returns {Array.<number>} - (exactly 4 entries)
      * @deprecated
      */
     toVec() {
         return [this.x, this.y, this.z, this.w];
-    };
+    }
 
     /**
      * Converts vector to a number array.
      * @public
-     * @returns {Array.<number,number,number,number>}
+     * @returns {Array.<number>} - (exactly 4 entries)
      */
     toArray() {
         return [this.x, this.y, this.z, this.w];
-    };
+    }
 
     /**
      * Sets vector's values.
@@ -127,7 +128,7 @@ export class Vec4 {
      * @param {number} y - Value Y.
      * @param {number} z - Value Z.
      * @param {number} w - Value W.
-     * @returns {og.math.Vec4}
+     * @returns {Vec4}
      */
     set(x, y, z, w) {
         this.x = x;
@@ -135,13 +136,13 @@ export class Vec4 {
         this.z = z;
         this.w = w;
         return this;
-    };
+    }
 
     /**
      * Adds vector to the current.
      * @public
-     * @param {og.math.Vec4}
-     * @returns {og.math.Vec4}
+     * @param {Vec4}
+     * @returns {Vec4}
      */
     addA(v) {
         this.x += v.x;
@@ -149,13 +150,13 @@ export class Vec4 {
         this.z += v.z;
         this.w += v.w;
         return this;
-    };
+    }
 
     /**
      * Subtract vector from the current.
      * @public
-     * @param {og.math.Vec4} v - Subtract vector.
-     * @returns {og.math.Vec4}
+     * @param {Vec4} v - Subtract vector.
+     * @returns {Vec4}
      */
     subA(v) {
         this.x -= v.x;
@@ -163,13 +164,13 @@ export class Vec4 {
         this.z -= v.z;
         this.w -= v.w;
         return this;
-    };
+    }
 
     /**
      * Scale current vector.
      * @public
      * @param {number} scale - Scale value.
-     * @returns {og.math.Vec4}
+     * @returns {Vec4}
      */
     scale(scale) {
         this.x *= scale;
@@ -177,12 +178,12 @@ export class Vec4 {
         this.z *= scale;
         this.w *= scale;
         return this;
-    };
+    }
 
     /**
      * Makes vector affinity. Thereby fourh component becomes to 1.0.
      * @public
-     * @returns {og.math.Vec4}
+     * @returns {Vec4}
      */
     affinity() {
         var iw = 1 / this.w;
@@ -191,22 +192,22 @@ export class Vec4 {
         this.z *= iw;
         this.w = 1.0;
         return this;
-    };
+    }
 
     /**
      * Scale current vector to another instance.
      * @public
      * @param {number} scale - Scale value.
-     * @returns {og.Vec3}
+     * @returns {Vec3}
      */
     scaleTo(scale) {
         return new Vec4(this.x * scale, this.y * scale, this.z * scale, this.w * scale);
-    };
+    }
 
     /**
      * Vector's edge function that returns vector where each component is 0.0 if it's smaller then edge and otherwise 1.0.
      * @public
-     * @returns {og.math.Vec4}
+     * @returns {Vec4}
      */
     getStep(edge) {
         return new Vec4(
@@ -215,31 +216,26 @@ export class Vec4 {
             this.z < edge ? 0.0 : 1.0,
             this.w < edge ? 0.0 : 1.0
         );
-    };
+    }
 
     /**
      * The vector fract function returns the vector of fractional parts of each value, i.e. x minus floor(x).
      * @public
-     * @returns {og.math.Vec4}
+     * @returns {Vec4}
      */
     getFrac(v) {
-        return new Vec4(
-            og.math.frac(v.x),
-            og.math.frac(v.y),
-            og.math.frac(v.z),
-            og.math.frac(v.w)
-        );
-    };
+        return new Vec4(frac(v.x), frac(v.y), frac(v.z), frac(v.w));
+    }
 
     /**
      * Gets vectors dot production.
      * @public
-     * @param {og.math.Vec4} v - Another vector.
+     * @param {math.Vec4} v - Another vector.
      * @returns {number} - Dot product.
      */
     dot(v) {
         return v.x * this.x + v.y * this.y + v.z * this.z + v.w * this.w;
-    };
+    }
 
     /**
      * Returns true if vector's values are zero.
@@ -248,7 +244,7 @@ export class Vec4 {
      */
     isZero() {
         return !(this.x || this.y || this.z || this.w);
-    };
+    }
 }
 
 /**
@@ -258,8 +254,8 @@ export class Vec4 {
  * @param {number} [y] - Second value.
  * @param {number} [z] - Third value.
  * @param {number} [w] - Fourth value.
- * @returns {og.math.Vec4}
+ * @returns {Vec4}
  */
 export function vec4(x, y, z, w) {
-    return new og.math.Vec4(x, y, z, w);
-};
+    return new Vec4(x, y, z, w);
+}

package/src/og/math/coder.js

@@ -2,54 +2,54 @@
  * @module og/math/coder
  */
 
-'use strict';
+"use strict";
 
-import * as math from '../math.js';
-import { Vec4 } from './Vec4.js';
+import * as math from "../math.js";
+import { Vec4 } from "./Vec4.js";
 
 /**
  * Encode 32 bit float value to the RGBA vector.
  * @function
  * @param {number} v - 32 bit float value.
- * @returns {og.math.Vec4} - RGBA vector value.
+ * @returns {math.Vec4} - RGBA vector value.
  */
 export function encodeFloatToRGBA(v) {
-    var enc = new Vec4(1.0 * v % 1, 255.0 * v % 1, 65025.0 * v % 1, 160581375.0 * v % 1);
+    var enc = new Vec4((1.0 * v) % 1, (255.0 * v) % 1, (65025.0 * v) % 1, (160581375.0 * v) % 1);
     var yzww = new Vec4(enc.y / 255, enc.z / 255, enc.w / 255, 0);
     return enc.subA(yzww);
-};
+}
 
 /**
  * Decode RGBA vector to 32 bit float value.
  * @function
- * @param {og.Vec4} rgba - RGBA encoded 32 bit float value.
+ * @param {Vec4} rgba - RGBA encoded 32 bit float value.
  * @returns {number} - Float value.
  */
 export function decodeFloatFromRGBA(rgba) {
     var s = 1.0 - math.step(128.0, rgba.x) * 2.0;
     var e = 2.0 * math.mod(rgba.x, 128.0) + math.step(128.0, rgba.y) - 127.0;
-    var m = math.mod(rgba.y, 128.0) * 65536.0 + rgba.z * 256.0 + rgba.w + 8388608.00;
+    var m = math.mod(rgba.y, 128.0) * 65536.0 + rgba.z * 256.0 + rgba.w + 8388608.0;
     return s * math.exp2(e) * (m * 1.1920928955078125e-7);
-};
+}
 
 /**
  * Decode RGBA vector to 32 bit float value.
  * @function
- * @param {og.Vec4} rgba - RGBA encoded 32 bit float value.
+ * @param {Vec4} rgba - RGBA encoded 32 bit float value.
  * @returns {number} - Float value.
  */
 export function decodeFloatFromRGBAArr(arr, use32) {
     var s = 1.0 - math.step(128.0, arr[0]) * 2.0;
     var e = 2.0 * math.mod(arr[0], 128.0) + math.step(128.0, arr[1]) - 127.0;
-    var m = math.mod(arr[1], 128.0) * 65536.0 + arr[2] * 256.0 + (use32 ? arr[3] : 0.0) + 8388608.00;
+    var m = math.mod(arr[1], 128.0) * 65536.0 + arr[2] * 256.0 + (use32 ? arr[3] : 0.0) + 8388608.0;
     return s * math.exp2(e) * (m * 1.1920928955078125e-7);
-};
+}
 
 /**
  * Separate 64 bit value to two 32 bit float values.
  * @function
  * @param {number} value - Double type value.
- * @returns {Array.<number,number>} Encoded array.
+ * @returns {Array.<number>} Encoded array. (exactly 2 entries)
  */
 export function doubleToTwoFloats(value) {
     var high, low;
@@ -63,13 +63,13 @@ export function doubleToTwoFloats(value) {
         low = Math.fround(value + doubleHigh);
     }
     return new Float32Array([high, low]);
-};
+}
 
 /**
  * Separate 64 bit value to two 32 bit float values.
  * @function
  * @param {number} value - Double type value.
- * @returns {Array.<number,number>} Encoded array.
+ * @returns {Array.<number>} Encoded array. (exactly 2 entries)
  */
 export function doubleToTwoFloats2(value, highLowArr) {
     if (value >= 0.0) {
@@ -82,13 +82,13 @@ export function doubleToTwoFloats2(value, highLowArr) {
         highLowArr[1] = Math.fround(value + doubleHigh);
     }
     return highLowArr;
-};
+}
 
 /**
  * Separate 64 bit value to two 32 bit float values.
  * @function
  * @param {number} value - Double type value.
- * @returns {Array.<number,number>} Encoded array.
+ * @returns {Array.<number>} Encoded array. (exactly 2 entries)
  */
 export function doubleToTwoFloatsV2(value, highLowVec) {
     if (value >= 0.0) {
@@ -101,4 +101,4 @@ export function doubleToTwoFloatsV2(value, highLowVec) {
         highLowVec.y = Math.fround(value + doubleHigh);
     }
     return highLowVec;
-};
+}

package/src/og/math.js

@@ -77,7 +77,7 @@ export const EPSILON20 = 1e-20;
  * @param {number} base - Base value.
  * @returns {number} -
  * @example
- * og.math.log(64, 2)
+ * log(64, 2)
  * //returns 6
  */
 export function log(n, base) {
@@ -92,7 +92,7 @@ export function log(n, base) {
  * @param {number} max - Maximal edge.
  * @returns {number} -
  * @example
- * og.math.clamp(12, 1, 5)
+ * clamp(12, 1, 5)
  * //returns 5
  */
 export function clamp(number, min, max) {
@@ -200,9 +200,9 @@ export function mod(m, n) {
  * @returns {number} -
  */
 export function zeroTwoPI(a) {
-    var mod = og.math.mod(a, og.math.TWO_PI);
-    if (Math.abs(mod) < og.math.EPSILON14 && Math.abs(a) > og.math.EPSILON14) {
-        return og.math.TWO_PI;
+    var mod = mod(a, TWO_PI);
+    if (Math.abs(mod) < EPSILON14 && Math.abs(a) > EPSILON14) {
+        return TWO_PI;
     }
     return mod;
 }
@@ -235,7 +235,7 @@ export function frac(x) {
  * @returns {number} -
  */
 export function log2(x) {
-    return Math.log(x) / og.math.LOG2;
+    return Math.log(x) / LOG2;
 }
 
 /**
@@ -299,11 +299,11 @@ export function bezier1v(t, p0, p1, p2, p3) {
  * Performs a 3D bezier interpolation.
  * @function
  * @param {number} t - Interpolation value.
- * @param {og.Vec3} p0 - First control point.
- * @param {og.Vec3} p1 - Second control point.
- * @param {og.Vec3} p2 - Third control point.
- * @param {og.Vec3} p3 - Fourth control point.
- * @returns {og.Vec3} -
+ * @param {Vec3} p0 - First control point.
+ * @param {Vec3} p1 - Second control point.
+ * @param {Vec3} p2 - Third control point.
+ * @param {Vec3} p3 - Fourth control point.
+ * @returns {Vec3} -
  */
 export function bezier3v(t, p0, p1, p2, p3) {
     var u = 1 - t;
@@ -346,7 +346,7 @@ export function norm_lon(lon) {
  * @returns {number} -
  */
 export function negativePItoPI(a) {
-    return og.math.zeroTwoPI(a + Math.PI) - Math.PI;
+    return zeroTwoPI(a + Math.PI) - Math.PI;
 }
 
 /**

package/src/og/mercator.js

@@ -48,7 +48,7 @@ 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.
@@ -58,7 +58,7 @@ export function forward(lonLat) {
  */
 export function forward_lon(lon) {
     return lon * POLE / 180.0;
-};
+}
 
 /**
  * Converts degrees latitude to mercator coordinate.
@@ -68,7 +68,7 @@ export function forward_lon(lon) {
  */
 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.
@@ -78,7 +78,7 @@ export function forward_lat(lat) {
  */
 export function inverse_lon(lon) {
     return 180 * lon / POLE;
-};
+}
 
 /**
  * Converts mercator latitude to degrees coordinate.
@@ -88,7 +88,7 @@ export function inverse_lon(lon) {
  */
 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 
@@ -100,7 +100,7 @@ export function inverse_lat(lat) {
  */
 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 
@@ -112,13 +112,13 @@ export function getTileX(lon, zoom) {
  */
 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.<og.LonLat>} lonLatArr - LonLat array to convert.
- * @returns {Array.<og.LonLat>}
+ * @param {Array.<LonLat>} lonLatArr - LonLat array to convert.
+ * @returns {Array.<LonLat>}
  */
 export function forwardArray(lonlatArr) {
     var res = [];
@@ -126,13 +126,13 @@ export function forwardArray(lonlatArr) {
         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.

package/src/og/proj/EPSG3857.js

@@ -2,12 +2,12 @@
  * @module og/proj/EPSG3857
  */
 
-'use strict';
+"use strict";
 
-import { Units, Proj } from './Proj.js';
+import { Units, Proj } from "./Proj.js";
 
 /**
  * EPSG:3857 projection object.
- * @type {og.Proj}
+ * @type {Proj}
  */
-export const EPSG3857 = new Proj({ code: "epsg:3857", units: Units.METERS });
+export const EPSG3857 = new Proj({ code: "epsg:3857", units: Units.METERS });

package/src/og/proj/EPSG4326.js

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

package/src/og/proj/Proj.js

@@ -2,7 +2,7 @@
  * @module og/proj/Proj
  */
 
-'use strict';
+"use strict";
 
 /**
  * Projection units: 'degrees', 'ft', 'm' or 'km'.
@@ -26,38 +26,38 @@ METERS_PER_UNIT[Units.FEET] = 0.3048;
 METERS_PER_UNIT[Units.METERS] = 1;
 METERS_PER_UNIT[Units.KILOMETERS] = 1000;
 
-const Proj = function (options) {
+let _counter = 0;
+class Proj {
+    constructor(options) {
+        /**
+         * @public
+         * @type {string}
+         */
+        this.code = options.code;
+
+        /**
+         * @public
+         * @type {proj.Units}
+         */
+        this.units = /** @type {Units} */ (options.units);
+
+        /**
+         * Projection identifier, especially usefull for comparison.
+         * @const
+         * @type {integer}
+         */
+        this.id = _counter++;
+    }
 
     /**
+     * Compare projections.
      * @public
-     * @type {string}
+     * @param {Proj} proj - Projetion object.
+     * @returns {boolean}
      */
-    this.code = options.code;
+    equal(proj) {
+        return proj.id === this.id;
+    }
+}
 
-    /**
-     * @public
-     * @type {og.proj.Units}
-     */
-    this.units = /** @type {Units} */ (options.units);
-
-    /**
-     * Projection identifier, especially usefull for comparison.
-     * @const
-     * @type {integer}
-     */
-    this.id = Proj._counter++;
-};
-
-/**
- * Compare projections.
- * @public
- * @param {og.Proj} proj - Projetion object.
- * @returns {boolean}
- */
-Proj.prototype.equal = function (proj) {
-    return proj.id === this.id;
-};
-
-Proj._counter = 0;
-
-export { Proj };
+export { Proj };