Rename coordinate systems files (#19)

felixpalmer · web-flow · commit bce983e43065 · 2025-05-23T22:28:22.000+02:00
diff --git a/examples/website/area/app.tsx b/examples/website/area/app.tsx
@@ -7,7 +7,7 @@ import {H3HexagonLayer} from '@deck.gl/geo-layers';
 import {PolygonLayer} from '@deck.gl/layers';
 import {cellArea, getRes0Cells, cellToChildren, cellToVertexes, vertexToLatLng, greatCircleDistance, cellToBoundary, cellToLatLng, isPentagon} from 'h3-js';
 import {generateWireframe} from 'a5-internal/wireframe';
-import {toCartesian, fromLonLat} from 'a5/core/math';
+import {toCartesian, fromLonLat} from 'a5/core/coordinate-transforms';
 import {colorContinuous} from '@deck.gl/carto';
 
 import {pentagonArea} from 'a5/core/utils';
diff --git a/examples/website/golf/app.tsx b/examples/website/golf/app.tsx
@@ -4,7 +4,7 @@ import { Canvas, useThree } from '@react-three/fiber';
 import { OrbitControls, Environment } from '@react-three/drei';
 import { ACESFilmicToneMapping, Vector3, Matrix4, Euler, DoubleSide, BackSide } from 'three';
 import { generateWireframe } from 'a5-internal/wireframe';
-import { fromLonLat, toCartesian } from 'a5/core/math';
+import { fromLonLat, toCartesian } from 'a5/core/coordinate-transforms';
 
 type DimplePosition = { center: Vector3; up: Vector3; };
 
diff --git a/examples/website/teohedron-dodecahedron/app.tsx b/examples/website/teohedron-dodecahedron/app.tsx
@@ -5,7 +5,7 @@ import { OrbitControls } from '@react-three/drei';
 import { DoubleSide, BufferGeometry, BufferAttribute, Vector3 } from 'three';
 import { generateWireframe } from 'a5-internal/wireframe';
 
-import {fromLonLat, toCartesian} from 'a5/core/math';
+import {fromLonLat, toCartesian} from 'a5/core/coordinate-transforms';
 
 const RESOLUTION = 3;
 
diff --git a/modules/core/cell.ts b/modules/core/cell.ts
@@ -5,8 +5,8 @@
 import { mat2, vec2, glMatrix } from "gl-matrix";
 glMatrix.setMatrixArrayType(Float64Array as any);
 
-import type { Face, LonLat } from "./types";
-import { FaceToIJ, fromLonLat, toFace } from "./math";
+import type { Face, LonLat } from "./coordinate-systems";
+import { FaceToIJ, fromLonLat, toFace } from "./coordinate-transforms";
 import { findNearestOrigin, quintantToSegment, segmentToQuintant } from "./origin";
 import { unprojectDodecahedron } from "./dodecahedron";
 import { A5Cell, PentagonShape } from "./utils";
diff --git a/modules/core/constants.ts b/modules/core/constants.ts
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (c) A5 contributors
 
-import type { Radians } from "./types";
+import type { Radians } from "./coordinate-systems";
 
 // Golden ratio
 export const φ = (1 + Math.sqrt(5)) / 2;
diff --git a/modules/core/coordinate-systems.ts b/modules/core/coordinate-systems.ts
diff --git a/modules/core/coordinate-transforms.ts b/modules/core/coordinate-transforms.ts
@@ -4,7 +4,7 @@
 
 import { vec2, quat, glMatrix } from 'gl-matrix';
 glMatrix.setMatrixArrayType(Float64Array as any);
-import type { Degrees, Radians, Face, Polar, IJ, Cartesian, Spherical, LonLat } from "./types";
+import type { Degrees, Radians, Face, Polar, IJ, Cartesian, Spherical, LonLat } from "./coordinate-systems";
 import { BASIS_INVERSE, BASIS } from "./pentagon";
 
 export function degToRad(deg: Degrees): Radians {
diff --git a/modules/core/dodecahedron.ts b/modules/core/dodecahedron.ts
@@ -4,8 +4,8 @@
 
 import { vec3, quat, glMatrix } from "gl-matrix";
 glMatrix.setMatrixArrayType(Float64Array as any);
-import { toCartesian, toSpherical } from "./math";
-import type { Radians, Spherical, Cartesian, Polar } from "./types";
+import { toCartesian, toSpherical } from "./coordinate-transforms";
+import type { Radians, Spherical, Cartesian, Polar } from "./coordinate-systems";
 import { unwarpPolar, warpPolar } from './warp';
 import { projectGnomonic, unprojectGnomonic } from './gnomonic';
 
diff --git a/modules/core/gnomonic.ts b/modules/core/gnomonic.ts
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (c) A5 contributors
 
-import type { Polar, Spherical } from './types';
+import type { Polar, Spherical } from './coordinate-systems';
 
 export function projectGnomonic([rho, gamma]: Polar): Spherical {
   return [gamma, Math.atan(rho)] as Spherical;
diff --git a/modules/core/hilbert.ts b/modules/core/hilbert.ts
@@ -4,7 +4,7 @@
 
 import { vec2, glMatrix } from 'gl-matrix';
 glMatrix.setMatrixArrayType(Float64Array as any);
-import { IJ, KJ } from './types';
+import { IJ, KJ } from './coordinate-systems';
 
 export type Quaternary = 0 | 1 | 2 | 3;
 export const YES = -1 as const;
diff --git a/modules/core/origin.ts b/modules/core/origin.ts
@@ -4,8 +4,8 @@
 
 import { vec2, vec3, quat, glMatrix } from 'gl-matrix';
 glMatrix.setMatrixArrayType(Float64Array as any);
-import { toCartesian, quatFromSpherical } from "./math";
-import type { Radians, Spherical, Cartesian, Face } from "./types";
+import { toCartesian, quatFromSpherical } from "./coordinate-transforms";
+import type { Radians, Spherical, Cartesian, Face } from "./coordinate-systems";
 import { interhedralAngle, PI_OVER_5, TWO_PI_OVER_5, distanceToEdge } from './constants';
 import { Orientation } from "./hilbert";
 
diff --git a/modules/core/pentagon.ts b/modules/core/pentagon.ts
@@ -6,7 +6,7 @@ import { vec2, mat2, glMatrix } from 'gl-matrix';
 glMatrix.setMatrixArrayType(Float64Array as any);
 import {distanceToEdge, PI_OVER_10, PI_OVER_5} from './constants';    
 import {PentagonShape} from './utils';
-import type {Degrees, Face} from './types';
+import type { Face, LonLat, Degrees } from "./coordinate-systems";
 
 // Pentagon vertex angles
 const A = 72 as Degrees;
diff --git a/modules/core/project.ts b/modules/core/project.ts
@@ -7,8 +7,8 @@ glMatrix.setMatrixArrayType(Float64Array as any);
 import { PentagonShape } from './utils';
 import { Origin, movePointToFace, findNearestOrigin, isNearestOrigin } from './origin';
 import { projectDodecahedron } from './dodecahedron';
-import type { Face, LonLat, Polar, Radians } from './types';
-import { toLonLat, toPolar } from './math';
+import type { Face, LonLat, Polar, Radians } from './coordinate-systems';
+import { toLonLat, toPolar } from './coordinate-transforms';
 import { PI_OVER_5 } from './constants';
 
 // Reusable matrices to avoid recreation
diff --git a/modules/core/utils.ts b/modules/core/utils.ts
@@ -6,7 +6,7 @@ import {vec2, mat2, mat2d, vec3, glMatrix} from 'gl-matrix';
 glMatrix.setMatrixArrayType(Float64Array as any);
 import { Origin } from './origin';
 import { Triangle } from './triangle';
-import type { Degrees, LonLat, Face } from './types';
+import type { Degrees, LonLat, Face } from './coordinate-systems';
 
 export type Pentagon = [Face, Face, Face, Face, Face];
 
diff --git a/modules/core/warp.ts b/modules/core/warp.ts
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (c) A5 contributors
 
-import type { Radians, Polar } from './types';
+import type { Radians, Polar } from './coordinate-systems';
 import { distanceToEdge, PI_OVER_5, TWO_PI_OVER_5, WARP_FACTOR } from './constants';
 
 export function normalizeGamma(gamma: Radians): Radians {
diff --git a/modules/index.ts b/modules/index.ts
@@ -14,5 +14,5 @@ export {hexToBigInt, bigIntToHex} from './core/hex';
 export {cellToParent, cellToChildren, getResolution} from './core/serialization';
 
 // Types
-export type {Degrees, Radians} from './core/types';
+export type {Degrees, Radians} from './core/coordinate-systems';
 export type {A5Cell} from './core/utils';
diff --git a/modules/internal/helpers.ts b/modules/internal/helpers.ts
@@ -4,7 +4,8 @@
 
 import { vec2, mat2, glMatrix } from 'gl-matrix';
 glMatrix.setMatrixArrayType(Float64Array as any);
-import { LonLat, Face, fromLonLat, toFace } from '../core/math';
+import { fromLonLat, toFace } from '../core/coordinate-transforms';
+import type { LonLat, Face } from '../core/coordinate-systems';
 import { findNearestOrigin } from '../core/origin';
 import { unprojectDodecahedron } from '../core/dodecahedron';
 import { PI_OVER_5 } from '../core/constants';
diff --git a/modules/internal/wireframe.ts b/modules/internal/wireframe.ts
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (c) A5 contributors
 
-import { LonLat } from '../core/math';
+import type { LonLat } from '../core/coordinate-systems';
 import { cellToBoundary } from '../core/cell';
 import { cellToChildren, FIRST_HILBERT_RESOLUTION } from '../core/serialization';
 
diff --git a/tests/coordinate-transforms.test.ts b/tests/coordinate-transforms.test.ts
@@ -5,12 +5,9 @@ import {
   toCartesian,
   toSpherical,
   fromLonLat,
-  toLonLat,
-  Degrees,
-  LonLat,
-  Radians,
-  Spherical,
-} from 'a5/core/math'
+  toLonLat
+} from 'a5/core/coordinate-transforms'
+import type { Degrees, LonLat, Radians, Spherical } from 'a5/core/coordinate-systems'
 
 describe('angle conversions', () => {
   it('converts degrees to radians', () => {
diff --git a/tests/dodecahedron.test.ts b/tests/dodecahedron.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect } from 'vitest'
 import { projectDodecahedron, unprojectDodecahedron } from 'a5/core/dodecahedron'
 import { origins } from 'a5/core/origin'
-import type { Polar } from 'a5/core/types'
+import type { Polar } from 'a5/core/coordinate-systems'
 import TEST_COORDS from './test-polar-coordinates.json';
 
 describe('Dodecahedron projection round trip', () => {
diff --git a/tests/gnomonic.test.ts b/tests/gnomonic.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect } from 'vitest'
 import { projectGnomonic, unprojectGnomonic } from 'a5/core/gnomonic'
-import type { Polar, Spherical } from 'a5/core/types'
+import type { Polar, Spherical } from 'a5/core/coordinate-systems'
 import TEST_COORDS from './test-polar-coordinates.json';
 
 describe('projectGnomonic', () => {
diff --git a/tests/origin.test.ts b/tests/origin.test.ts
@@ -10,8 +10,8 @@ import {
   movePointToFace,
 } from 'a5/core/origin'
 import { distanceToEdge, PI_OVER_5, TWO_PI_OVER_5 } from 'a5/core/constants'
-import type { Face, Radians, Spherical } from 'a5/core/types'
-import { toCartesian } from 'a5/core/math'
+import type { Face, Radians, Spherical } from 'a5/core/coordinate-systems'
+import { toCartesian } from 'a5/core/coordinate-transforms'
 
 describe('origin constants', () => {
   it('has 12 origins for dodecahedron faces', () => {
diff --git a/tests/utils.test.ts b/tests/utils.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect } from 'vitest'
 import { Contour, Pentagon, PentagonShape } from 'a5/core/utils'
-import type { Degrees, LonLat } from 'a5/core/types'
+import type { Degrees, LonLat } from 'a5/core/coordinate-systems'
 
 describe('PentagonShape', () => {
   describe('containsPoint', () => {
diff --git a/tests/warp.test.ts b/tests/warp.test.ts
@@ -2,7 +2,7 @@ import { describe, it, expect } from 'vitest'
 import { warpPoint, unwarpPoint } from 'a5/core/warp'
 import { normalizeGamma, warpPolar, unwarpPolar, warpBeta, unwarpBeta } from 'a5/core/warp'
 import { PI_OVER_5, PI_OVER_10, TWO_PI_OVER_5, distanceToEdge } from 'a5/core/constants'
-import type { Radians, Polar } from 'a5/core/types'
+import type { Radians, Polar } from 'a5/core/coordinate-systems'
 import TEST_COORDS from './test-polar-coordinates.json';
 
 describe('normalizeGamma', () => {
