@maplat/transform 0.1.5 → 0.2.1

package/src/edgeutils.ts

@@ -1,4 +1,4 @@
-import { Position } from "geojson";
+import type { Position } from "geojson";
 
 /**
  * エッジの終点を表す型

package/src/geometry.ts

@@ -1,6 +1,6 @@
 import booleanPointInPolygon from "@turf/boolean-point-in-polygon";
 import { featureCollection } from "@turf/helpers";
-import { Feature, FeatureCollection, Polygon, Point, Position } from "geojson";
+import type { Feature, FeatureCollection, Polygon, Point, Position } from "geojson";
 //import { Tri, Tins, IndexedTins, WeightBuffer, VerticesParams } from "./index";
 type PropertyTri = { geom: Position; index: number | string };
 export type PropertyTriKey = "a" | "b" | "c";
@@ -8,7 +8,7 @@ type PropertiesTri = { [key in PropertyTriKey]: PropertyTri };
 export type Tri = Feature<Polygon, PropertiesTri>;
 export type Tins = FeatureCollection<Polygon, PropertiesTri>;
 export type WeightBuffer = { [index: string]: number };
-export type VerticesParams = [number[], FeatureCollection<Polygon>[]?];
+export type VerticesParams = [number[], Tins[]?];
 export interface IndexedTins {
   gridNum: number;
   xOrigin: number;
@@ -40,7 +40,7 @@ function hit(point: Feature<Point>, tins: Tins): Tri | undefined {
  * @param weightBuffer 重み付けバッファ（オプション）
  * @returns 変換後の座標
  */
-function transformTinArr(of: any, tri: any, weightBuffer: any) {
+function transformTinArr(of: Feature<Point>, tri: Tri, weightBuffer: WeightBuffer | undefined) {
   const a = tri.geometry.coordinates[0][0];
   const b = tri.geometry.coordinates[0][1];
   const c = tri.geometry.coordinates[0][2];
@@ -97,7 +97,10 @@ function useVerticesArr(
   const centCoord = centroid.geometry!.coordinates;
   const radian = Math.atan2(coord[0] - centCoord[0], coord[1] - centCoord[1]);
   const index = decideUseVertex(radian, verticesParams[0]);
-  const tin = verticesParams[1]![index as any];
+  if (index === undefined) {
+    throw new Error("Unable to determine vertex index");
+  }
+  const tin = verticesParams[1]![index];
   return transformTinArr(o, tin.features[0], weightBuffer);
 }
 
@@ -145,7 +148,7 @@ function transformArr(
           ? gridCache[normX][normY]
           : []
         : [];
-      tins = featureCollection(tinsKey.map((key: any) => tins.features[key]));
+      tins = featureCollection(tinsKey.map((key: number) => tins.features[key]));
     }
     tin = hit(point, tins);
   }
@@ -189,7 +192,7 @@ function unitCalc(
  * const index = decideUseVertex(0.5, [0, Math.PI/2, Math.PI, Math.PI*3/2]);
  * // returns 0 (最初の頂点が最も近い)
  */
-function decideUseVertex(radian: any, radianList: any) {
+function decideUseVertex(radian: number, radianList: number[]): number | undefined {
   // 最初の頂点との角度差を正規化
   let idel = normalizeRadian(radian - radianList[0]);
   let minTheta = Math.PI * 2;  // 最小角度差の初期値
@@ -226,13 +229,13 @@ function decideUseVertex(radian: any, radianList: any) {
 * // [0, 2π)の範囲に正規化
 * normalizeRadian(3 * Math.PI, true); // returns π
 */
-function normalizeRadian(target: any, noNegative = false) {
+function normalizeRadian(target: number, noNegative = false): number {
  // 正規化の範囲を決定する関数
  const rangeFunc = noNegative
-   ? function (val: any) {
+   ? function (val: number) {
        return !(val >= 0 && val < Math.PI * 2);  // [0, 2π)の範囲外
      }
-   : function (val: any) {
+   : function (val: number) {
        return !(val > -1 * Math.PI && val <= Math.PI);  // (-π, π]の範囲外
      };
 

package/src/index.ts

@@ -1,20 +1,20 @@
 import booleanPointInPolygon from "@turf/boolean-point-in-polygon";
 import { featureCollection, point } from "@turf/helpers";
 import { getCoords } from "@turf/invariant";
-import { indexesToTri, normalizeNodeKey } from "./triangulation";
-import { Feature, Polygon, Position, Point, FeatureCollection } from "geojson";
-import { normalizeEdges } from "./edgeutils";
+import { indexesToTri, normalizeNodeKey } from "./triangulation.ts";
+import type { Feature, Polygon, Position, Point, FeatureCollection } from "geojson";
+import { normalizeEdges } from "./edgeutils.ts";
 import type { 
   WeightBuffer, Tins, VerticesParams, PropertyTriKey, 
   IndexedTins, Tri
-} from "./geometry";
-import { unitCalc, transformArr } from "./geometry";
-import type { EdgeSet, EdgeSetLegacy } from "./edgeutils";
-export type { Tins, Tri, PropertyTriKey } from './geometry';
-export { transformArr } from './geometry';
-export { rotateVerticesTriangle, counterTri } from './triangulation';
-export type { Edge, EdgeSet, EdgeSetLegacy } from './edgeutils';
-export { normalizeEdges } from './edgeutils';
+} from "./geometry.ts";
+import { unitCalc, transformArr } from "./geometry.ts";
+import type { EdgeSet, EdgeSetLegacy } from "./edgeutils.ts";
+export type { Tins, Tri, PropertyTriKey } from './geometry.ts';
+export { transformArr } from './geometry.ts';
+export { rotateVerticesTriangle, counterTri } from './triangulation.ts';
+export type { Edge, EdgeSet, EdgeSetLegacy } from './edgeutils.ts';
+export { normalizeEdges } from './edgeutils.ts';
 
 /**
  * 座標ペアの型定義。[ソース座標, ターゲット座標] の形式
@@ -164,10 +164,10 @@ export class Transform {
    * 3. TINネットワークの再構築
    * 4. インデックスの作成
    */
-  setCompiled(compiled: Compiled | CompiledLegacy) {
+  setCompiled(compiled: Compiled | CompiledLegacy): void {
     if (
       compiled.version ||
-      (!(compiled as any).tins && compiled.points && compiled.tins_points)
+      (!(compiled as CompiledLegacy).tins && compiled.points && compiled.tins_points)
     ) {
       // 新コンパイルロジック
       // pointsはそのままpoints
@@ -250,7 +250,7 @@ export class Transform {
       const bakwI = compiled.tins_points.length == 1 ? 0 : 1;
       this.tins = {
       forw: featureCollection(
-        compiled.tins_points[0].map((idxes: any) =>
+        compiled.tins_points[0].map((idxes: (number | string)[]) =>
         indexesToTri(
           idxes,
           compiled.points,
@@ -263,7 +263,7 @@ export class Transform {
         )
       ),
       bakw: featureCollection(
-        compiled.tins_points[bakwI].map((idxes: any) =>
+        compiled.tins_points[bakwI].map((idxes: (number | string)[]) =>
         indexesToTri(
           idxes,
           compiled.points,
@@ -324,27 +324,20 @@ export class Transform {
       this.vertices_params = compiled.vertices_params as VerticesParamsBD;
       this.centroid = (compiled as CompiledLegacy).centroid;
       this.kinks = (compiled as CompiledLegacy).kinks;
-      const points: any = [];
+      const points: PointSet[] = [];
       for (let i = 0; i < this.tins!.forw!.features.length; i++) {
       const tri = this.tins!.forw!.features[i];
       (["a", "b", "c"] as PropertyTriKey[]).map((key, idx) => {
         const forw = tri.geometry!.coordinates[0][idx];
         const bakw = tri.properties![key].geom;
         const pIdx = tri.properties![key].index;
-        points[pIdx] = [forw, bakw];
+        if (typeof pIdx === 'number') {
+          points[pIdx] = [forw, bakw];
+        }
       });
       }
       this.points = points;
     }
-    // 翻訳したオブジェクトを返す
-    return {
-      tins: this.tins,
-      strict_status: this.strict_status,
-      weight_buffer: this.pointsWeightBuffer,
-      vertices_params: this.vertices_params,
-      centroid: this.centroid,
-      kinks: this.kinks
-    };
   }
 
   /**
@@ -451,7 +444,7 @@ export class Transform {
     const bakwXUnit = (bakwBound[1][0] - bakwBound[0][0]) / gridNum;
     const bakwYUnit = (bakwBound[1][1] - bakwBound[0][1]) / gridNum;
     const bakwGridCache = bakwEachBound.reduce(
-      (prev: any, bound: any, index: number) => {
+      (prev: number[][][], bound: Position[], index: number) => {
         const normXMin = unitCalc(
           bound[0][0],
           bakwBound[0][0],
@@ -517,7 +510,7 @@ export class Transform {
    * 
    * @throws {Error} 逆方向変換が許可されていない状態での逆変換時
    */
-  transform(apoint: number[], backward?: boolean, ignoreBounds?: boolean) {
+  transform(apoint: number[], backward?: boolean, ignoreBounds?: boolean): number[] | false {
     if (backward && this.strict_status == Transform.STATUS_ERROR)
       throw 'Backward transform is not allowed if strict_status == "strict_error"';
     // if (!this.tins) this.updateTin();

package/src/triangulation.ts

@@ -1,6 +1,6 @@
 import { polygon } from "@turf/helpers";
-import { Position } from "geojson";
-import { PropertyTriKey, Tri, Tins } from "./geometry";
+import type { Position } from "geojson";
+import { PropertyTriKey, Tri, Tins } from "./geometry.ts";
 
 /**
  * 三角形の頂点の順序を修正する
@@ -8,7 +8,7 @@ import { PropertyTriKey, Tri, Tins } from "./geometry";
  * @param tins 三角形群
  * @returns 頂点順序が修正された三角形群
  */
-function rotateVerticesTriangle(tins: Tins) {
+function rotateVerticesTriangle(tins: Tins): Tins {
   const features = tins.features;
   for (let i = 0; i < features.length; i++) {
     const feature = features[i];
@@ -138,7 +138,7 @@ function indexesToTri(
   const points_: [Position[], string | number][] = indexes.map(
     (index: number | string) => {
       if (!version || version < 2.00703) index = normalizeNodeKey(index);
-      const point_base = isFinite(index as any)
+      const point_base = isFinite(index as number)
         ? points[index as number]
         : index === "c"
         ? cent