fix exports and naming conventions

README.md

@@ -5,7 +5,7 @@
 [npm-url]: https://npmjs.org/package/s2-tools
 [crate-image]: https://img.shields.io/crates/v/s2-tools.svg?logo=rust&logoColor=white
 [crate-url]: https://crates.io/crates/s2-tools
-[bundle-image]: https://img.shields.io/bundlejs/size/s2-tools?exports=s2-tools
+[bundle-image]: https://img.shields.io/bundlejs/size/s2-tools
 [bundle-url]: https://bundlejs.com/?q=s2-tools&treeshake=%5B%7B+s2-tools+%7D%5D
 [downloads-image]: https://img.shields.io/npm/dm/s2-tools.svg
 [downloads-url]: https://www.npmjs.com/package/s2-tools

package.json

@@ -1,6 +1,6 @@
 {
   "name": "s2-tools",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "A collection of geospatial tools primarily designed for WGS84, Web Mercator, and S2.",
   "type": "module",
   "keywords": [

src/converters/toJSON/index.ts

@@ -1,7 +1,7 @@
 import { convert } from '../../geometry/convert';
 import { mergeBBoxes } from '../../geometry';
 
-import type { FeatureIterator } from 's2-tools/readers';
+import type { FeatureIterator } from '../../readers';
 import type { Writer } from '../../writers';
 import type { BBOX, Projection, VectorFeatures } from '../../geometry';
 

src/dataStructures/pointCluster.ts

@@ -1,6 +1,6 @@
 import { Tile } from '../dataStructures';
 import { convert } from '../geometry/convert';
-import { fromS2Points } from 's2-tools/geometry/s1/chordAngle';
+import { fromS2Points } from '../geometry/s1/chordAngle';
 import { PointShape as Point, PointIndex } from './pointIndex';
 import {
   addMut,

src/proj4/datum.ts

@@ -13,9 +13,9 @@ import {
   SRS_WGS84_SEMIMINOR,
 } from './constants';
 
-import type { DatumParams } from 's2-tools/readers/wkt';
-import type { NadSubGrid } from 's2-tools/readers/nadgrid';
-import type { VectorPoint } from 's2-tools/geometry';
+import type { DatumParams } from '../readers/wkt';
+import type { NadSubGrid } from '../readers/nadgrid';
+import type { VectorPoint } from '../geometry';
 import type { ProjectionParams, ProjectionTransform, Transformer } from '.';
 
 const { abs, sin, cos, sqrt, atan2, atan, PI, floor } = Math;

src/proj4/parseCode.ts

@@ -7,9 +7,9 @@ import {
   deriveEccentricity,
   deriveSphere,
 } from './constants';
-import { isWKTProjection, parseWKTProjection } from 's2-tools/readers/wkt';
+import { isWKTProjection, parseWKTProjection } from '../readers/wkt';
 
-import type { DatumParams } from 's2-tools/readers/wkt';
+import type { DatumParams } from '../readers/wkt';
 import type { ProjectionParams } from './projections';
 import type { Transformer } from './transformer';
 

src/proj4/projections/aea.ts

@@ -2,7 +2,7 @@ import { EPSLN } from '../constants';
 import { ProjectionBase } from './base';
 import { adjustLon, asinz, msfnz, qsfnz } from '../common';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 const { abs, pow, sin, cos, sqrt, atan2, asin, log } = Math;

src/proj4/projections/aeqd.ts

@@ -2,7 +2,7 @@ import { ProjectionBase } from './base';
 import { EPSLN, HALF_PI } from '../constants';
 import { adjustLon, asinz, e0fn, e1fn, e2fn, e3fn, gN, imlfn, mlfn } from '../common';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 const { abs, pow, sin, cos, sqrt, atan2, asin, acos, PI, tan, atan } = Math;

src/proj4/projections/base.ts

@@ -1,9 +1,9 @@
 import { D2R, PJD_NODATUM, R2D } from '../constants';
 
-import type { DatumParams } from 's2-tools/readers/wkt';
-import type { GridDefinition } from 's2-tools/readers/nadgrid';
+import type { DatumParams } from '../../readers/wkt';
+import type { GridDefinition } from '../../readers/nadgrid';
 import type { ProjectionTransform } from '.';
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 
 /** Define the projection with all it's variable components */
 export interface ProjectionParams {

src/proj4/projections/bonne.ts

@@ -3,7 +3,7 @@ import { ProjectionBase } from './base';
 import { adjustLat, adjustLon, hypot, pjEnfn, pjInvMlfn, pjMlfn } from '../common';
 
 import type { En } from '../common';
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 const EPS10 = 1e-10;

src/proj4/projections/cass.ts

@@ -2,7 +2,7 @@ import { ProjectionBase } from './base';
 import { EPSLN, HALF_PI } from '../constants';
 import { adjustLat, adjustLon, e0fn, e1fn, e2fn, e3fn, gN, imlfn, mlfn } from '../common';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 const { abs, sin, cos, asin, atan2, tan, pow } = Math;

src/proj4/projections/cea.ts

@@ -1,7 +1,7 @@
 import { ProjectionBase } from './base';
 import { adjustLon, iqsfnz, msfnz, qsfnz } from '../common';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 const { sin, cos, asin } = Math;

src/proj4/projections/eqc.ts

@@ -1,7 +1,7 @@
 import { ProjectionBase } from '.';
 import { adjustLat, adjustLon } from '../common';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 /**

src/proj4/projections/eqdc.ts

@@ -2,7 +2,7 @@ import { EPSLN } from '../constants';
 import { ProjectionBase } from '.';
 import { adjustLat, adjustLon, e0fn, e1fn, e2fn, e3fn, imlfn, mlfn, msfnz } from '../common';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 const { abs, sin, cos, sqrt, atan2 } = Math;

src/proj4/projections/eqearth.ts

@@ -30,7 +30,7 @@
 import { ProjectionBase } from '.';
 import { adjustLon } from '../common';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 const { abs, sin, cos, sqrt, asin } = Math;

src/proj4/projections/equi.ts

@@ -1,7 +1,7 @@
 import { ProjectionBase } from '.';
 import { adjustLon } from '../common';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 /**

src/proj4/projections/etmerc.ts

@@ -4,7 +4,7 @@
 import { TransverseMercator } from './tmerc';
 import { adjustLon, asinhy, clens, clensCmplx, gatg, hypot, sinh } from '../common';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 const { abs, pow, sin, cos, sqrt, atan2, tan, atan } = Math;

src/proj4/projections/gauss.ts

@@ -2,7 +2,7 @@ import { ProjectionBase } from '.';
 import { srat } from '../common';
 import { HALF_PI, QUART_PI } from '../constants';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 const { abs, pow, sin, cos, sqrt, asin, tan, atan } = Math;

src/proj4/projections/geocent.ts

@@ -1,7 +1,7 @@
 import { ProjectionBase } from '.';
 import { geocentricToGeodetic, geodeticToGeocentric } from '../datum';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 /** Geocentric Projection */

src/proj4/projections/geos.ts

@@ -1,7 +1,7 @@
 import { ProjectionBase } from '.';
 import { hypot } from '../common';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 const { sin, cos, sqrt, tan, atan, atan2 } = Math;

src/proj4/projections/gnom.ts

@@ -2,7 +2,7 @@ import { EPSLN } from '../constants';
 import { ProjectionBase } from '.';
 import { adjustLon, asinz } from '../common';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 const { abs, sin, cos, sqrt, atan2 } = Math;

src/proj4/projections/gstmerc.ts

@@ -1,7 +1,7 @@
 import { ProjectionBase } from '.';
 import { cosh, invlatiso, latiso, sinh } from '../common';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 const { pow, sin, cos, sqrt, atan, asin } = Math;

src/proj4/projections/index.ts

@@ -36,8 +36,8 @@ import { VanDerGrinten } from './vandg';
 
 import { ProjectionBase } from './base';
 
-import type { DatumParams } from 's2-tools/readers/wkt';
-import type { GridDefinition } from 's2-tools/readers/nadgrid';
+import type { DatumParams } from '../../readers/wkt';
+import type { GridDefinition } from '../../readers/nadgrid';
 import type { VectorPoint } from 's2json-spec';
 
 export * from './aea';

src/proj4/projections/krovak.ts

@@ -1,7 +1,7 @@
 import { ProjectionBase } from '.';
 import { adjustLon } from '../common';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 const { abs, pow, sin, cos, sqrt, atan2, asin, tan, atan } = Math;

src/proj4/projections/laea.ts

@@ -2,7 +2,7 @@ import { ProjectionBase } from '.';
 import { EPSLN, HALF_PI, QUART_PI } from '../constants';
 import { adjustLon, qsfnz } from '../common';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 export const S_POLE = 1;

src/proj4/projections/lcc.ts

@@ -2,7 +2,7 @@ import { ProjectionBase } from '.';
 import { EPSLN, HALF_PI } from '../constants';
 import { adjustLon, msfnz, phi2z, sign, tsfnz } from '../common';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 const { abs, pow, sin, cos, sqrt, atan2, log, PI } = Math;

src/proj4/projections/merc.ts

@@ -2,7 +2,7 @@ import { ProjectionBase } from './base';
 import { EPSLN, HALF_PI, QUART_PI } from '../constants';
 import { adjustLon, msfnz, phi2z, tsfnz } from '../common';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 const { abs, sin, cos, sqrt, log, tan, atan, exp } = Math;

src/proj4/projections/mill.ts

@@ -1,7 +1,7 @@
 import { ProjectionBase } from '.';
 import { adjustLon } from '../common';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 const { tan, atan, PI, log, exp } = Math;

src/proj4/projections/moll.ts

@@ -2,7 +2,7 @@ import { EPSLN } from '../constants';
 import { ProjectionBase } from '.';
 import { adjustLon } from '../common';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 const { abs, PI, sin, cos, asin } = Math;

src/proj4/projections/nzmg.ts

@@ -1,7 +1,7 @@
 import { ProjectionBase } from '.';
 import { SEC_TO_RAD } from '../constants';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 /**

src/proj4/projections/omerc.ts

@@ -2,7 +2,7 @@ import { ProjectionBase } from '.';
 import { D2R, EPSLN, HALF_PI, QUART_PI, TWO_PI } from '../constants';
 import { adjustLon, phi2z, tsfnz } from '../common';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 const { abs, pow, sin, cos, sqrt, atan2, asin, log, atan, PI, tan, exp } = Math;

src/proj4/projections/ortho.ts

@@ -2,7 +2,7 @@ import { ProjectionBase } from '.';
 import { EPSLN, HALF_PI } from '../constants';
 import { adjustLon, asinz } from '../common';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 const { abs, sin, cos, sqrt, atan2 } = Math;

src/proj4/projections/poly.ts

@@ -2,7 +2,7 @@ import { EPSLN } from '../constants';
 import { ProjectionBase } from '.';
 import { adjustLat, adjustLon, e0fn, e1fn, e2fn, e3fn, gN, mlfn } from '../common';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 const { abs, pow, sin, cos, sqrt, asin, tan } = Math;

src/proj4/projections/qsc.ts

@@ -1,7 +1,7 @@
 import { ProjectionBase } from '.';
 import { EPSLN, HALF_PI, QUART_PI, SPI, TWO_PI } from '../constants';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 const { abs, sin, cos, sqrt, atan2, atan, tan, acos } = Math;

src/proj4/projections/robin.ts

@@ -2,7 +2,7 @@ import { ProjectionBase } from '.';
 import { adjustLon } from '../common';
 import { D2R, EPSLN, HALF_PI, R2D } from '../constants';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 const { abs, floor } = Math;

src/proj4/projections/sinu.ts

@@ -3,7 +3,7 @@ import { EPSLN, HALF_PI } from '../constants';
 import { adjustLat, adjustLon, asinz, pjEnfn, pjInvMlfn, pjMlfn } from '../common';
 
 import type { En } from '../common';
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 const { abs, sin, cos, sqrt, asin } = Math;

src/proj4/projections/somerc.ts

@@ -1,6 +1,6 @@
 import { ProjectionBase } from '.';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 const { abs, pow, sin, cos, sqrt, asin, atan, exp, log, tan, PI } = Math;

src/proj4/projections/stere.ts

@@ -2,7 +2,7 @@ import { ProjectionBase } from '.';
 import { EPSLN, HALF_PI } from '../constants';
 import { adjustLon, msfnz, phi2z, sign, tsfnz } from '../common';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 const { abs, pow, sin, cos, sqrt, atan2, asin, tan, atan, PI } = Math;

src/proj4/projections/sterea.ts

@@ -1,7 +1,7 @@
 import { GaussKruger } from './gauss';
 import { adjustLon, hypot } from '../common';
 
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 const { sin, cos, atan2, asin } = Math;

src/proj4/projections/tmerc.ts

@@ -6,7 +6,7 @@ import { EPSLN, HALF_PI } from '../constants';
 import { adjustLon, pjEnfn, pjInvMlfn, pjMlfn, sign } from '../common';
 
 import type { En } from '../common';
-import type { VectorPoint } from 's2-tools/geometry';
+import type { VectorPoint } from '../../geometry';
 import type { ProjectionParams, ProjectionTransform } from '.';
 
 const { abs, pow, sin, cos, sqrt, atan2, asin, log, tan, acos, exp } = Math;