nodes2ts 1.1.9 → 3.0.0

package/.eslintignore

@@ -0,0 +1,3 @@
+dist
+gulpfile.js
+test

package/.eslintrc.cjs

@@ -0,0 +1,11 @@
+module.exports = {
+  root: true,
+  parser: '@typescript-eslint/parser',
+  plugins: [
+    '@typescript-eslint',
+  ],
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended',
+  ],
+};

package/.github/workflows/lint.js.yml

@@ -0,0 +1,22 @@
+name: Lint CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [16.x]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: yarn --frozen-lockfile
+      - run: yarn lint

package/.github/workflows/node.js.yml

@@ -0,0 +1,22 @@
+name: Node.js CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [14.x, 16.x]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: yarn --frozen-lockfile
+      - run: yarn test

package/.mocharc.js

@@ -0,0 +1,7 @@
+module.exports = {
+  recursive: true,
+  bail: true,
+  require: 'ts-node/register',
+  extension: ['ts']
+}
+

package/README.md

@@ -1,12 +1,19 @@
-### Node S2Geometry Typescript
+### Node S2 Geometry Typescript
+<img src="https://github.com/vekexasia/nodes2-ts/actions/workflows/node.js.yml/badge.svg" />
 
-An extensive port of google's s2 geometry library written in Typescript.
+<img src="https://img.shields.io/badge/TypeScript-007ACC?style=for-the-badge&logo=typescript&logoColor=white"/> <img 
+src="https://img.shields.io/badge/mocha.js-323330?style=for-the-badge&logo=mocha&logoColor=Brown"/> <img 
+src="https://img.shields.io/badge/eslint-3A33D1?style=for-the-badge&logo=eslint&logoColor=white"/>
 
-The library uses `decimal.js` and `long` as external libraries to perform the needed math.
 
+An extensive port of google's s2 geometry library written in TypeScript.
+
+The only direct dependencies are some math related npm packages (long and math-float64-exponent).
+
+Npm package is `nodes2ts`.
 
 #### Tests
-This project is backed by 56 1-by-1 comparison tests between this implementation and the original one.
+This project is backed by 60+ 1-by-1 comparison tests between this implementation and the original one.
 
 When implementing a not-yet-ported feature, please generate the needed tests by modifiying the java code within `java-test-creator` folder
 
@@ -51,7 +58,7 @@ Also, for some classes, an extra `toGEOJSON` method is provided to let developer
 - Convert Lat/Lng to S2CellId
 ```typescript
 const cellId = S2CellId.fromPoint(
-  S2LatLng.fromDegrees(10 /*latitude*/, 11 /*longitude*/)
+  S2LatLng.fromDegrees(10 /*latitude*/, 11 /*longitude*/).toPoint()
 );
 ```
 
@@ -77,6 +84,16 @@ console.log(cell.toGEOJSON());
 // copy the output and paste it on http://geojson.io/
 ```
 
+## Contributing
+
+The library was initially conceived to be used in both server and client env leveraging TypeScript peculiarities.
+
+If you wish to contribute please make sure, wherever applicable, to create a tiny merge request to ease the code 
+review of the proposed changes.
+
+## Want to connect with the author?
 
+If you wish to contact the library author for business (or any other) proposal you can write an email to `vekexasia` 
+`at` gmail `dot` com.
 
 

package/dist/Interval.d.ts

@@ -1,22 +1,21 @@
-/// <reference types="decimal.js" />
 export declare abstract class Interval {
-    lo: decimal.Decimal;
-    hi: decimal.Decimal;
-    constructor(lo: number | decimal.Decimal, hi: number | decimal.Decimal);
+    lo: number;
+    hi: number;
+    constructor(lo: number, hi: number);
     /** Return true if the interval is empty, i.e. it contains no points. */
     abstract isEmpty(): boolean;
     /**
      * Return the center of the interval. For empty intervals, the result is
      * arbitrary.
      */
-    abstract getCenter(): decimal.Decimal;
+    abstract getCenter(): number;
     /**
      * Return the length of the interval. The length of an empty interval is
      * negative.
      */
-    abstract getLength(): decimal.Decimal;
-    abstract contains(p: number | decimal.Decimal): boolean;
-    abstract interiorContains(p: number | decimal.Decimal): boolean;
+    abstract getLength(): number;
+    abstract contains(p: number): boolean;
+    abstract interiorContains(p: number): boolean;
     toString(): string;
     /**
      * Return true if two intervals contains the same set of points.

package/dist/Interval.js

@@ -1,23 +1,23 @@
 "use strict";
-var S2_1 = require("./S2");
-var Interval = (function () {
-    function Interval(lo, hi) {
-        this.lo = S2_1.S2.toDecimal(lo);
-        this.hi = S2_1.S2.toDecimal(hi);
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Interval = void 0;
+class Interval {
+    constructor(lo, hi) {
+        this.lo = lo;
+        this.hi = hi;
     }
-    Interval.prototype.toString = function () {
+    toString() {
         return "[" + this.lo.toString() + ", " + this.hi.toString() + "]";
-    };
+    }
     /**
      * Return true if two intervals contains the same set of points.
      */
-    Interval.prototype.equals = function (that) {
+    equals(that) {
         if (typeof (that) === typeof (this)) {
-            return this.lo.eq(that.lo) && this.hi.eq(that.hi);
+            return this.lo == that.lo && this.hi == that.hi;
         }
         return false;
-    };
-    return Interval;
-}());
+    }
+}
 exports.Interval = Interval;
 //# sourceMappingURL=Interval.js.map

package/dist/Interval.js.map

@@ -1 +1 @@
-{"version":3,"file":"Interval.js","sourceRoot":"","sources":["../src/Interval.ts"],"names":[],"mappings":";AAAA,mBAAiB,MAAM,CAAC,CAAA;AACxB;IAIE,kBAAY,EAAyB,EAAE,EAAyB;QAC9D,IAAI,CAAC,EAAE,GAAG,OAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAC3B,IAAI,CAAC,EAAE,GAAG,OAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAC7B,CAAC;IAsBO,2BAAQ,GAAhB;QACE,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,GAAG,CAAC;IACpE,CAAC;IAGD;;OAEG;IACI,yBAAM,GAAb,UAAc,IAAQ;QACpB,EAAE,CAAC,CAAC,OAAM,CAAC,IAAI,CAAC,KAAK,OAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACrD,CAAC;QACD,MAAM,CAAC,KAAK,CAAC;IACf,CAAC;IAGH,eAAC;AAAD,CAAC,AA7CD,IA6CC;AA7CqB,gBAAQ,WA6C7B,CAAA"}
+{"version":3,"file":"Interval.js","sourceRoot":"","sources":["../src/Interval.ts"],"names":[],"mappings":";;;AAAA,MAAsB,QAAQ;IAI5B,YAAY,EAAS,EAAE,EAAS;QAC9B,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,CAAC;IAsBO,QAAQ;QACd,OAAO,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,GAAG,CAAC;IACpE,CAAC;IAGD;;OAEG;IACI,MAAM,CAAC,IAAQ;QACpB,IAAI,OAAM,CAAC,IAAI,CAAC,KAAK,OAAM,CAAC,IAAI,CAAC,EAAE;YACjC,OAAO,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC;SACjD;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CAGF;AA7CD,4BA6CC"}

package/dist/MutableInteger.js

@@ -1,9 +1,10 @@
 "use strict";
-var MutableInteger = (function () {
-    function MutableInteger(val) {
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MutableInteger = void 0;
+class MutableInteger {
+    constructor(val) {
         this.val = val;
     }
-    return MutableInteger;
-}());
+}
 exports.MutableInteger = MutableInteger;
 //# sourceMappingURL=MutableInteger.js.map

package/dist/MutableInteger.js.map

@@ -1 +1 @@
-{"version":3,"file":"MutableInteger.js","sourceRoot":"","sources":["../src/MutableInteger.ts"],"names":[],"mappings":";AAAA;IAEE,wBAAmB,GAAU;QAAV,QAAG,GAAH,GAAG,CAAO;IAC7B,CAAC;IACH,qBAAC;AAAD,CAAC,AAJD,IAIC;AAJY,sBAAc,iBAI1B,CAAA"}
+{"version":3,"file":"MutableInteger.js","sourceRoot":"","sources":["../src/MutableInteger.ts"],"names":[],"mappings":";;;AAAA,MAAa,cAAc;IAEzB,YAAmB,GAAU;QAAV,QAAG,GAAH,GAAG,CAAO;IAC7B,CAAC;CACF;AAJD,wCAIC"}

package/dist/Platform.d.ts

@@ -0,0 +1,15 @@
+export declare class Platform {
+    static IEEEremainder(f1: number, f2: number): number;
+    /**
+     * If v is non-zero, return an integer {@code exp} such that
+     * {@code (0.5 <= |v|*2^(-exp) < 1)}. If v is zero, return 0.
+     *
+     * <p>Note that this arguably a bad definition of exponent because it makes
+     * {@code exp(9) == 4}. In decimal this would be like saying that the
+     * exponent of 1234 is 4, when in scientific 'exponent' notation 1234 is
+     * {@code 1.234 x 10^3}.
+     *
+     * TODO(dbeaumont): Replace this with "DoubleUtils.getExponent(v) - 1" ?
+     */
+    static getExponent(v: number): number;
+}

package/dist/Platform.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Platform = void 0;
+const exponent = require("math-float64-exponent");
+class Platform {
+    static IEEEremainder(f1, f2) {
+        // let r = f1 % f2;
+        // if (isNaN(r) || r == (f2) || r <= (Math.abs(f2) / 2)) {
+        //   return r;
+        // } else {
+        //   return (f1 >= (0) ? 1 : -1) * (r - f2);
+        // }
+        if (Number.isNaN(f1)) {
+            return f1;
+        }
+        if (Number.isNaN(f2)) {
+            return f2;
+        }
+        if ((f2 === Number.POSITIVE_INFINITY || f2 === Number.NEGATIVE_INFINITY) && Number.isFinite(f1)) {
+            return f1;
+        }
+        return f1 - (Math.round(f1 / f2) * f2);
+    }
+    /**
+     * If v is non-zero, return an integer {@code exp} such that
+     * {@code (0.5 <= |v|*2^(-exp) < 1)}. If v is zero, return 0.
+     *
+     * <p>Note that this arguably a bad definition of exponent because it makes
+     * {@code exp(9) == 4}. In decimal this would be like saying that the
+     * exponent of 1234 is 4, when in scientific 'exponent' notation 1234 is
+     * {@code 1.234 x 10^3}.
+     *
+     * TODO(dbeaumont): Replace this with "DoubleUtils.getExponent(v) - 1" ?
+     */
+    static getExponent(v) {
+        // if (v == 0) {
+        //   return 0;
+        // }
+        // // IT should always be ((int)log(2,v))+1;
+        // const start = Math.floor(Math.log(v)/Math.log(2));
+        // for(let i= start; i<start+10; i++) {
+        //   const curVal = Math.abs(v) * Math.pow(2,-i);
+        //   if (curVal >= 0.5 && curVal < 1 ) {
+        //     return i;
+        //   }
+        // }
+        // throw new Error('method not written yet');
+        // // return (int)((S2.EXPONENT_MASK & bits) >> S2.EXPONENT_SHIFT) - 1022;
+        return exponent(v);
+    }
+}
+exports.Platform = Platform;
+//# sourceMappingURL=Platform.js.map

package/dist/Platform.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Platform.js","sourceRoot":"","sources":["../src/Platform.ts"],"names":[],"mappings":";;;AAAA,kDAAmD;AACnD,MAAa,QAAQ;IACZ,MAAM,CAAC,aAAa,CAAC,EAAU,EAAE,EAAU;QAChD,mBAAmB;QAEnB,0DAA0D;QAC1D,cAAc;QACd,WAAW;QACX,4CAA4C;QAC5C,IAAI;QAEJ,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE;YACpB,OAAO,EAAE,CAAC;SACX;QAED,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE;YACpB,OAAO,EAAE,CAAA;SACV;QAED,IAAI,CAAC,EAAE,KAAK,MAAM,CAAC,iBAAiB,IAAI,EAAE,KAAK,MAAM,CAAC,iBAAiB,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE;YAC/F,OAAO,EAAE,CAAC;SACX;QAED,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;IACzC,CAAC;IAED;;;;;;;;;;OAUG;IACI,MAAM,CAAC,WAAW,CAAC,CAAQ;QAChC,gBAAgB;QAChB,cAAc;QACd,IAAI;QACJ,4CAA4C;QAC5C,qDAAqD;QACrD,uCAAuC;QACvC,iDAAiD;QACjD,wCAAwC;QACxC,gBAAgB;QAChB,MAAM;QACN,IAAI;QACJ,6CAA6C;QAC7C,0EAA0E;QAC1E,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC;IACrB,CAAC;CACF;AApDD,4BAoDC"}

package/dist/R1Interval.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="decimal.js" />
 import { Interval } from "./Interval";
 /**
  * An R1Interval represents a closed interval on a unit circle (also known as a
@@ -22,11 +21,11 @@ import { Interval } from "./Interval";
 export declare class R1Interval extends Interval {
     /** Return true if the interval is empty, i.e. it contains no points. */
     isEmpty(): boolean;
-    getCenter(): decimal.Decimal;
-    getLength(): decimal.Decimal;
-    contains(_p: number | decimal.Decimal): boolean;
+    getCenter(): number;
+    getLength(): number;
+    contains(p: number): boolean;
     /** Return true if the interior of the interval contains the point 'p'. */
-    interiorContains(_p: number | decimal.Decimal): boolean;
+    interiorContains(p: number): boolean;
     /**
      * Return true if the interval contains the given interval 'y'. Works for
      * empty, full, and singleton intervals.
@@ -44,13 +43,13 @@ export declare class R1Interval extends Interval {
      */
     interiorIntersects(y: R1Interval): boolean;
     /** Expand the interval so that it contains the given point "p". */
-    addPoint(_p: number | decimal.Decimal): R1Interval;
+    addPoint(p: number): R1Interval;
     /**
      * Return an interval that contains all points with a distance "radius" of a
      * point in this interval. Note that the expansion of an empty interval is
      * always empty.
      */
-    expanded(_radius: number | decimal.Decimal): R1Interval;
+    expanded(radius: number): R1Interval;
     /**
      * Return the smallest interval that contains this interval and the given
      * interval "y".
@@ -67,11 +66,11 @@ export declare class R1Interval extends Interval {
      */
     approxEquals(y: R1Interval, maxError?: number): boolean;
     static empty(): R1Interval;
-    static fromPoint(p: number | decimal.Decimal): R1Interval;
+    static fromPoint(p: number): R1Interval;
     /**
      * Convenience method to construct the minimal interval containing the two
      * given points. This is equivalent to starting with an empty interval and
      * calling AddPoint() twice, but it is more efficient.
      */
-    static fromPointPair(_p1: number | decimal.Decimal, _p2: number | decimal.Decimal): R1Interval;
+    static fromPointPair(p1: number, p2: number): R1Interval;
 }

package/dist/R1Interval.js

@@ -1,12 +1,7 @@
 "use strict";
-var __extends = (this && this.__extends) || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-};
-var Interval_1 = require("./Interval");
-var S2_1 = require("./S2");
-var decimal_1 = require('./decimal');
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.R1Interval = void 0;
+const Interval_1 = require("./Interval");
 /**
  * An R1Interval represents a closed interval on a unit circle (also known as a
  * 1-dimensional sphere). It is capable of representing the empty interval
@@ -26,152 +21,138 @@ var decimal_1 = require('./decimal');
  * [-Pi, Pi], and the Empty() interval is [Pi, -Pi].
  *
  */
-var R1Interval = (function (_super) {
-    __extends(R1Interval, _super);
-    function R1Interval() {
-        _super.apply(this, arguments);
-    }
+class R1Interval extends Interval_1.Interval {
     /** Return true if the interval is empty, i.e. it contains no points. */
-    R1Interval.prototype.isEmpty = function () {
-        return this.lo.gt(this.hi);
-    };
-    R1Interval.prototype.getCenter = function () {
-        return this.lo.plus(this.hi).dividedBy(2);
-    };
-    R1Interval.prototype.getLength = function () {
-        return this.hi.minus(this.lo);
-    };
-    R1Interval.prototype.contains = function (_p) {
-        var p = S2_1.S2.toDecimal(_p);
-        return p.gte(this.lo) && p.lte(this.hi);
-    };
+    isEmpty() {
+        return this.lo > this.hi;
+    }
+    getCenter() {
+        return (this.lo + this.hi) / 2;
+    }
+    getLength() {
+        return this.hi - this.lo;
+    }
+    contains(p) {
+        return p >= this.lo && p <= this.hi;
+    }
     /** Return true if the interior of the interval contains the point 'p'. */
-    R1Interval.prototype.interiorContains = function (_p) {
-        var p = S2_1.S2.toDecimal(_p);
-        return p.gt(this.lo) && p.lt(this.hi);
-    };
+    interiorContains(p) {
+        return p > this.lo && p < this.hi;
+    }
     /**
      * Return true if the interval contains the given interval 'y'. Works for
      * empty, full, and singleton intervals.
      */
-    R1Interval.prototype.containsI = function (y) {
+    containsI(y) {
         if (y.isEmpty()) {
             return true;
         }
-        return y.lo.gte(this.lo) && y.hi.lte(this.hi);
-    };
-    R1Interval.prototype.interiorContainsI = function (y) {
+        return y.lo >= this.lo && y.hi <= this.hi;
+    }
+    interiorContainsI(y) {
         if (y.isEmpty()) {
             return true;
         }
-        return y.lo.gt(this.lo) && y.hi.lt(this.hi);
-    };
+        return y.lo > this.lo && y.hi < this.hi;
+    }
     /**
      * Return true if this interval intersects the given interval, i.e. if they
      * have any points in common.
      */
-    R1Interval.prototype.intersects = function (y) {
-        if (this.lo.lte(y.lo)) {
-            return y.lo.lte(this.hi) && y.lo.lte(y.hi);
+    intersects(y) {
+        if (this.lo <= y.lo) {
+            return y.lo <= (this.hi) && y.lo <= (y.hi);
         }
         else {
-            return this.lo.lte(y.hi) && this.lo.lte(this.hi);
+            return this.lo <= (y.hi) && this.lo <= (this.hi);
         }
-    };
+    }
     /**
      * Return true if the interior of this interval intersects any point of the
      * given interval (including its boundary).
      */
-    R1Interval.prototype.interiorIntersects = function (y) {
-        return y.lo.lt(this.hi) && this.lo.lt(y.hi) && this.lo.lt(this.hi) && y.lo.lte(y.hi);
-    };
+    interiorIntersects(y) {
+        return y.lo < (this.hi) && this.lo < (y.hi) && this.lo < (this.hi) && y.lo <= (y.hi);
+    }
     /** Expand the interval so that it contains the given point "p". */
-    R1Interval.prototype.addPoint = function (_p) {
-        var p = S2_1.S2.toDecimal(_p);
+    addPoint(p) {
         if (this.isEmpty()) {
             return R1Interval.fromPoint(p);
         }
-        else if (p.lt(this.lo)) {
+        else if (p < (this.lo)) {
             return new R1Interval(p, this.hi);
         }
-        else if (p.gt(this.hi)) {
+        else if (p > (this.hi)) {
             return new R1Interval(this.lo, p);
         }
         else {
             return new R1Interval(this.lo, this.hi);
         }
-    };
+    }
     /**
      * Return an interval that contains all points with a distance "radius" of a
      * point in this interval. Note that the expansion of an empty interval is
      * always empty.
      */
-    R1Interval.prototype.expanded = function (_radius) {
-        var radius = S2_1.S2.toDecimal(_radius);
+    expanded(radius) {
         // assert (radius >= 0);
         if (this.isEmpty()) {
             return this;
         }
-        return new R1Interval(this.lo.minus(radius), this.hi.plus(radius));
-    };
+        return new R1Interval(this.lo - radius, this.hi + radius);
+    }
     /**
      * Return the smallest interval that contains this interval and the given
      * interval "y".
      */
-    R1Interval.prototype.union = function (y) {
+    union(y) {
         if (this.isEmpty()) {
             return y;
         }
         if (y.isEmpty()) {
             return this;
         }
-        return new R1Interval(decimal_1.Decimal.min(this.lo, y.lo), decimal_1.Decimal.max(this.hi, y.hi));
-    };
+        return new R1Interval(Math.min(this.lo, y.lo), Math.max(this.hi, y.hi));
+    }
     /**
      * Return the intersection of this interval with the given interval. Empty
      * intervals do not need to be special-cased.
      */
-    R1Interval.prototype.intersection = function (y) {
-        return new R1Interval(decimal_1.Decimal.max(this.lo, y.lo), decimal_1.Decimal.min(this.hi, y.hi));
-    };
+    intersection(y) {
+        return new R1Interval(Math.max(this.lo, y.lo), Math.min(this.hi, y.hi));
+    }
     /**
      * Return true if the length of the symmetric difference between the two
      * intervals is at most the given tolerance.
      */
-    R1Interval.prototype.approxEquals = function (y, maxError) {
-        if (maxError === void 0) { maxError = 1e-15; }
+    approxEquals(y, maxError = 1e-15) {
         if (this.isEmpty()) {
-            return y.getLength().lte(maxError);
+            return y.getLength() <= (maxError);
         }
         if (y.isEmpty()) {
-            return this.getLength().lte(maxError);
+            return this.getLength() <= (maxError);
         }
-        return y.lo.minus(this.lo).abs()
-            .plus(y.hi.minus(this.hi).abs())
-            .lte(maxError);
-    };
-    R1Interval.empty = function () {
+        return Math.abs(y.lo - (this.lo)) + Math.abs(y.hi - this.hi) <= (maxError);
+    }
+    static empty() {
         return new R1Interval(1, 0);
-    };
-    R1Interval.fromPoint = function (p) {
+    }
+    static fromPoint(p) {
         return new R1Interval(p, p);
-    };
+    }
     /**
      * Convenience method to construct the minimal interval containing the two
      * given points. This is equivalent to starting with an empty interval and
      * calling AddPoint() twice, but it is more efficient.
      */
-    R1Interval.fromPointPair = function (_p1, _p2) {
-        var p1 = S2_1.S2.toDecimal(_p1);
-        var p2 = S2_1.S2.toDecimal(_p2);
-        if (p1.lte(p2)) {
+    static fromPointPair(p1, p2) {
+        if (p1 <= (p2)) {
             return new R1Interval(p1, p2);
         }
         else {
             return new R1Interval(p2, p1);
         }
-    };
-    return R1Interval;
-}(Interval_1.Interval));
+    }
+}
 exports.R1Interval = R1Interval;
 //# sourceMappingURL=R1Interval.js.map

package/dist/R1Interval.js.map

@@ -1 +1 @@
-{"version":3,"file":"R1Interval.js","sourceRoot":"","sources":["../src/R1Interval.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"R1Interval.js","sourceRoot":"","sources":["../src/R1Interval.ts"],"names":[],"mappings":";;;AAAA,yCAAoC;AACpC;;;;;;;;;;;;;;;;;;GAkBG;AAEH,MAAa,UAAW,SAAQ,mBAAQ;IAEtC,wEAAwE;IACjE,OAAO;QACZ,OAAO,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;IAC3B,CAAC;IAEM,SAAS;QACd,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC,GAAC,CAAC,CAAC;IAC/B,CAAC;IAEM,SAAS;QACd,OAAO,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;IAC3B,CAAC;IAEM,QAAQ,CAAC,CAAQ;QACtB,OAAO,CAAC,IAAI,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC;IAEtC,CAAC;IAED,0EAA0E;IACnE,gBAAgB,CAAC,CAAQ;QAC9B,OAAO,CAAC,GAAG,IAAI,CAAC,EAAE,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;IACpC,CAAC;IAED;;;OAGG;IACI,SAAS,CAAC,CAAY;QAC3B,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YACf,OAAO,IAAI,CAAC;SACb;QACD,OAAO,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC;IAC5C,CAAC;IAGM,iBAAiB,CAAC,CAAY;QACnC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YACf,OAAO,IAAI,CAAC;SACb;QACD,OAAO,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;IAC1C,CAAC;IAED;;;OAGG;IACI,UAAU,CAAC,CAAY;QAC5B,IAAI,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE;YACnB,OAAO,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SAC5C;aAAM;YACL,OAAO,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAClD;IACH,CAAC;IAED;;;OAGG;IACI,kBAAkB,CAAC,CAAY;QACpC,OAAO,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACvF,CAAC;IAED,mEAAmE;IAC5D,QAAQ,CAAC,CAAQ;QACtB,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE;YAClB,OAAO,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;SAChC;aAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;YACxB,OAAO,IAAI,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;SACnC;aAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;YACxB,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;SACnC;aAAM;YACL,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;SACzC;IACH,CAAC;IAED;;;;OAIG;IACI,QAAQ,CAAC,MAAa;QAC3B,wBAAwB;QACxB,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE;YAClB,OAAO,IAAI,CAAC;SACb;QACD,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,GAAG,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC;IAC5D,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,CAAY;QACvB,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE;YAClB,OAAO,CAAC,CAAC;SACV;QACD,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YACf,OAAO,IAAI,CAAC;SACb;QACD,OAAO,IAAI,UAAU,CACjB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EACvB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAC1B,CAAC;IACJ,CAAC;IAED;;;OAGG;IACI,YAAY,CAAC,CAAY;QAC9B,OAAO,IAAI,UAAU,CACjB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EACvB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAC1B,CAAC;IACJ,CAAC;IAED;;;OAGG;IACI,YAAY,CAAC,CAAY,EAAE,QAAQ,GAAC,KAAK;QAC9C,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE;YAClB,OAAO,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;SACpC;QACD,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YACf,OAAO,IAAI,CAAC,SAAS,EAAE,IAAI,CAAE,QAAQ,CAAC,CAAC;SACxC;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,GAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC9E,CAAC;IAID,MAAM,CAAC,KAAK;QACV,OAAO,IAAI,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC9B,CAAC;IAGD,MAAM,CAAC,SAAS,CAAC,CAAQ;QACvB,OAAO,IAAI,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC9B,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,aAAa,CAAC,EAAS,EAAE,EAAS;QACvC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,EAAE;YACd,OAAO,IAAI,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;SAC/B;aAAM;YACL,OAAO,IAAI,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;SAC/B;IACH,CAAC;CACF;AA3JD,gCA2JC"}

package/dist/R2Vector.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="decimal.js" />
 import { S2Point } from "./S2Point";
 /**
  * R2Vector represents a vector in the two-dimensional space. It defines the
@@ -9,27 +8,27 @@ import { S2Point } from "./S2Point";
 export declare class R2Vector {
     private _x;
     private _y;
-    constructor(_x: number | decimal.Decimal, _y: number | decimal.Decimal);
-    readonly x: decimal.Decimal;
-    readonly y: decimal.Decimal;
-    get(index: number): decimal.Decimal;
+    constructor(_x: number, _y: number);
+    get x(): number;
+    get y(): number;
+    get(index: number): number;
     static fromPointFace(p: S2Point, face: number): R2Vector;
     static add(p1: R2Vector, p2: R2Vector): R2Vector;
-    static mul(p: R2Vector, _m: number | decimal.Decimal): R2Vector;
-    norm2(): decimal.Decimal;
-    static dotProd(p1: R2Vector, p2: R2Vector): decimal.Decimal;
-    dotProd(that: R2Vector): decimal.Decimal;
-    crossProd(that: R2Vector): decimal.Decimal;
+    static mul(p: R2Vector, m: number): R2Vector;
+    norm2(): number;
+    static dotProd(p1: R2Vector, p2: R2Vector): number;
+    dotProd(that: R2Vector): number;
+    crossProd(that: R2Vector): number;
     lessThan(vb: R2Vector): boolean;
     static fromSTVector(stVector: R2Vector): R2Vector;
-    static singleStTOUV(_s: number | decimal.Decimal): decimal.Decimal;
-    static singleUVToST(_x: number | decimal.Decimal): decimal.Decimal;
+    static singleStTOUV(s: number): number;
+    static singleUVToST(u: number): number;
     /**
      * To be used only if this vector is representing uv.
      * @param face
      * @returns {S2Point}
      */
     toPoint(face: number): S2Point;
-    toSt(which: any): decimal.Decimal;
+    toSt(which: any): number;
     toString(): string;
 }