refactor: improve code formatting and organization in labels and renderers

src/modules/labels.ts

@@ -79,15 +79,17 @@ class LabelsModule {
   }
 
   getBurgLabel(burgId: number): BurgLabelData | undefined {
-    return pack.labels.find(
+    return pack.labels.find((l) => l.type === "burg" && l.burgId === burgId) as
-      (l) => l.type === "burg" && l.burgId === burgId,
+      | BurgLabelData
-    ) as BurgLabelData | undefined;
+      | undefined;
   }
 
-  addStateLabel(
+  addStateLabel(data: Omit<StateLabelData, "i" | "type">): StateLabelData {
-    data: Omit<StateLabelData, "i" | "type">,
+    const label: StateLabelData = {
-  ): StateLabelData {
+      i: this.getNextId(),
-    const label: StateLabelData = { i: this.getNextId(), type: "state", ...data };
+      type: "state",
+      ...data,
+    };
     pack.labels.push(label);
     return label;
   }
@@ -98,10 +100,12 @@ class LabelsModule {
     return label;
   }
 
-  addCustomLabel(
+  addCustomLabel(data: Omit<CustomLabelData, "i" | "type">): CustomLabelData {
-    data: Omit<CustomLabelData, "i" | "type">,
+    const label: CustomLabelData = {
-  ): CustomLabelData {
+      i: this.getNextId(),
-    const label: CustomLabelData = { i: this.getNextId(), type: "custom", ...data };
+      type: "custom",
+      ...data,
+    };
     pack.labels.push(label);
     return label;
   }
@@ -123,8 +127,7 @@ class LabelsModule {
 
   removeByGroup(group: string): void {
     pack.labels = pack.labels.filter(
-      (l) =>
+      (l) => !((l.type === "burg" || l.type === "custom") && l.group === group),
-        !((l.type === "burg" || l.type === "custom") && l.group === group),
     );
   }
 
@@ -212,8 +215,6 @@ class LabelsModule {
 
     if (TIME) console.timeEnd("generateBurgLabels");
   }
-
 }
 
-
 window.Labels = new LabelsModule();

src/renderers/draw-state-labels.ts

@@ -1,17 +1,7 @@
 import { curveNatural, line, max, select } from "d3";
-import {
-  findClosestCell,
-  minmax,
-  rn,
-  round,
-  splitInTwo,
-} from "../utils";
 import type { StateLabelData } from "../modules/labels";
-import {
+import { findClosestCell, minmax, rn, round, splitInTwo } from "../utils";
-  raycast,
+import { ANGLES, findBestRayPair, raycast } from "./label-raycast";
-  findBestRayPair,
-  ANGLES,
-} from "./label-raycast";
 
 declare global {
   var drawStateLabels: (list?: number[]) => void;
@@ -57,7 +47,10 @@ const stateLabelsRenderer = (list?: number[]): void => {
   // Get labels to render
   const labelsToRender = list
     ? Labels.getAll()
-      .filter((l) => l.type === "state" && list.includes((l as StateLabelData).stateId))
+        .filter(
+          (l) =>
+            l.type === "state" && list.includes((l as StateLabelData).stateId),
+        )
         .map((l) => l as StateLabelData)
     : Labels.getByType("state").map((l) => l as StateLabelData);
 
@@ -67,7 +60,10 @@ const stateLabelsRenderer = (list?: number[]): void => {
   // restore labels visibility
   labels.style("display", layerDisplay);
 
-  function drawLabelPath(letterLength: number, labelDataList: StateLabelData[]): void {
+  function drawLabelPath(
+    letterLength: number,
+    labelDataList: StateLabelData[],
+  ): void {
     const mode = options.stateLabelsMode || "auto";
     const lineGen = line<[number, number]>().curve(curveNatural);
 
@@ -78,8 +74,7 @@ const stateLabelsRenderer = (list?: number[]): void => {
 
     for (const labelData of labelDataList) {
       const state = states[labelData.stateId];
-      if (!state.i || state.removed)
+      if (!state.i || state.removed) continue;
-        continue;
 
       // Calculate pathPoints using raycast algorithm (recalculated on each draw)
       const offset = getOffsetWidth(state.cells!);
@@ -161,16 +156,16 @@ const stateLabelsRenderer = (list?: number[]): void => {
       textElement.insertAdjacentHTML("afterbegin", spans.join(""));
 
       const { width, height } = textElement.getBBox();
-      textElement.setAttribute("href", `#textPath_stateLabel${labelData.stateId}`);
+      textElement.setAttribute(
+        "href",
+        `#textPath_stateLabel${labelData.stateId}`,
+      );
 
       const stateIds = pack.cells.state;
       if (mode === "full" || lines.length === 1) continue;
 
       // check if label fits state boundaries. If no, replace it with short name
-      const [[x1, y1], [x2, y2]] = [
+      const [[x1, y1], [x2, y2]] = [pathPoints.at(0)!, pathPoints.at(-1)!];
-        pathPoints.at(0)!,
-        pathPoints.at(-1)!,
-      ];
       const angleRad = Math.atan2(y2 - y1, x2 - x1);
 
       const isInsideState = checkIfInsideState(

src/renderers/label-raycast.ts

@@ -49,11 +49,7 @@ export function raycast({
   const stateIds = cells.state;
   let ray = { length: 0, x: x0, y: y0 };
 
-  for (
+  for (let length = LENGTH_START; length < LENGTH_MAX; length += LENGTH_STEP) {
-    let length = LENGTH_START;
-    length < LENGTH_MAX;
-    length += LENGTH_STEP
-  ) {
     const [x, y] = [x0 + length * dx, y0 + length * dy];
     // offset points are perpendicular to the ray
     const offset1: [number, number] = [x + -dy * offset, y + dx * offset];

src/types/PackedGraph.ts

@@ -1,11 +1,11 @@
 import type { Burg } from "../modules/burgs-generator";
 import type { Culture } from "../modules/cultures-generator";
 import type { PackedGraphFeature } from "../modules/features";
+import type { LabelData } from "../modules/labels";
 import type { Province } from "../modules/provinces-generator";
 import type { River } from "../modules/river-generator";
 import type { Route } from "../modules/routes-generator";
 import type { State } from "../modules/states-generator";
-import type { LabelData } from "../modules/labels";
 import type { Zone } from "../modules/zones-generator";
 
 type TypedArray =