Added sidebar list of trains

Zhincore · Jun 22, 2023 · 172b5df · 172b5df
1 parent 5fc950c
commit 172b5df
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 9 deletions.
diff --git a/src/RenderManager.ts b/src/RenderManager.ts
@@ -9,7 +9,7 @@ import {
 } from "./types/APITypes";
 import { Renderer } from "./types/Renderer";
 import { Stream } from "./Stream";
-import { Unarray } from "./utils";
+import { Unarray, getMapForDimension } from "./utils";
 import { TrackBlockRenderer } from "./renderers/TrackBlockRenderer";
 import { TrainRenderer } from "./renderers/TrainRenderer";
 import { SignalRenderer } from "./renderers/SignalRenderer";
@@ -101,6 +101,34 @@ export class RenderManager {
     $(dynmap).on("zoomchanged", () => {
       this.update();
     });
+
+    // Create sidebar lists
+    const trainSection = SidebarUtils.createListSection(config.layers.trains.label);
+    trainSection.section.appendTo(dynmap.sidebarPanel);
+    dynmap.sidebarSections.push(trainSection);
+    const trainList = trainSection.content as HTMLElement;
+    $(trainList).addClass("playerlist");
+
+    this.#streams.trains.onMessage((data) => {
+      for (const train of data.trains) {
+        const position = train.cars[0].leading;
+        const map = getMapForDimension(position.dimension, dynmap, config);
+
+        let $el = $("#train-" + train.id);
+        if (!$el.length) {
+          $el = $("<li>")
+            .attr("id", "train-" + train.id)
+            .addClass("player")
+            .append($("<a>").attr("href", "#").text(train.name))
+            .appendTo(trainList);
+        }
+        $el.off();
+        $el.on("click", () => {
+          if (dynmap.world.name == map?.options.world.name) dynmap.panToLocation(position.location);
+          else dynmap.selectMapAndPan(map, position.location);
+        });
+      }
+    });
   }
 
   #createHandler<T extends APILayers>(type: T) {

diff --git a/src/dynmap.d.ts b/src/dynmap.d.ts
@@ -1,5 +1,7 @@
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 type DynMap = any;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+declare const SidebarUtils: any;
 
 declare const componentconstructors: Record<string, (dynmap: DynMap, configuration: Record<string, unknown>) => void>;
 

diff --git a/src/renderers/PortalRenderer.ts b/src/renderers/PortalRenderer.ts
@@ -1,6 +1,6 @@
 import { TrainPortal } from "../types/APITypes";
 import { Renderer } from "../types/Renderer";
-import { Vector } from "../utils";
+import { Vector, getMapForDimension } from "../utils";
 
 export class PortalRenderer extends Renderer<TrainPortal, L.ImageOverlay> {
   render(portal: TrainPortal) {
@@ -14,17 +14,13 @@ export class PortalRenderer extends Renderer<TrainPortal, L.ImageOverlay> {
       interactive: true,
     });
 
-    const targetName = Object.entries(this.config.worlds).find(([_, v]) => v == portal.to.dimension)?.[0];
-    const target = targetName ? this.dynmap.worlds[targetName] : null;
+    const target = getMapForDimension(portal.to.dimension, this.dynmap, this.config);
 
-    img.bindTooltip(this.config.labels.portal + target?.title ?? portal.to.dimension, {});
+    img.bindTooltip(this.config.labels.portal + target?.options.world.title ?? portal.to.dimension, {});
 
     if (target) {
       img.on("click", () => {
-        this.dynmap.selectMapAndPan(
-          target.maps[this.dynmap.maptype.options.name] ?? target.maps[Object.keys(target.maps)[0]],
-          portal.to.location
-        );
+        this.dynmap.selectMapAndPan(target, portal.to.location);
       });
     }
 

diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -1,3 +1,11 @@
+import { IConfig } from "../types/IConfig";
+
 export * from "./Vector";
 
 export type Unarray<T> = T extends readonly (infer P)[] ? P : T;
+
+export function getMapForDimension(dimension: string, dynmap: DynMap, config: IConfig) {
+  const worldName = Object.entries(config.worlds).find(([_, v]) => v == dimension)?.[0];
+  const world = worldName ? dynmap.worlds[worldName] : null;
+  return world.maps[dynmap.maptype.options.name] ?? world.maps[Object.keys(world.maps)[0]];
+}