Merge pull request #33 from nguyenank/distance-fix

nguyenank · web-flow · commit 3e6d8fa55fb0 · 2025-03-29T13:08:53.000-07:00
Fixed
Fix goal coordinates being off for customizable dimension playing areas.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to the spirit of [Semantic Versioning](https://semver.org/spec/v2.0.0.html) as best it can without a proper API.
 
+## [2.4.1] - 2025-03-29
+
+### Fixed
+
+-   Fix goal coordinates being off for customizable dimension playing areas.
+
 ## [2.4.0] - 2025-01-31
 
 ### Added
@@ -299,6 +305,7 @@ and this project adheres to the spirit of [Semantic Versioning](https://semver.o
 -   Ability to click on rink to create dot and add row to table with the current details.
 -   Ability to download and upload table.
 
+[2.4.1]: https://github.com/nguyenank/shot-plotter/releases/tag/v2.4.1
 [2.4.0]: https://github.com/nguyenank/shot-plotter/releases/tag/v2.4.0
 [2.3.0]: https://github.com/nguyenank/shot-plotter/releases/tag/v2.3.0
 [2.2.0]: https://github.com/nguyenank/shot-plotter/releases/tag/v2.2.0
diff --git a/html/index.html b/html/index.html
@@ -49,11 +49,6 @@
 
     <body>
         <!-- inject:banner -->
-        <div class="alert alert-info" role="alert">
-    <b>01/31/25:</b> Men's lacrosse net and women's lacrosse net have been
-    added!
-</div>
-
         <!-- endinject -->
         <div class="center header">
             <h1>Shot-Plotter</h1>
diff --git a/js/custom-setups/playing-area-setup.js b/js/custom-setups/playing-area-setup.js
@@ -1,4 +1,10 @@
-import { sport, cfgSportA, dataStorage } from "../../setup.js";
+import {
+    sport,
+    cfgSportA,
+    dataStorage,
+    cfgSportGoalCoords,
+    setCfgSportGoalCoords,
+} from "../../setup.js";
 import { setRows, getRows } from "../table/table-functions.js";
 import { minMaxes } from "./min-max.js";
 
@@ -88,6 +94,11 @@ function customSoccerPlayingAreaSetup() {
     const goalarea = inYards ? 6 : 5.5;
     const arc = inYards ? 8 : 7.312;
 
+    setCfgSportGoalCoords([
+        [0, halfh],
+        [w, halfh],
+    ]);
+
     const svg = d3.select(`#${sport}-svg`);
     svg.attr("viewBox", `-1 -1 ${w + 2} ${h + 2}`);
 
@@ -197,6 +208,12 @@ function customIndoorLacrossePlayingAreaSetup() {
     const halfw = w / 2;
     const halfh = h / 2;
 
+    const goalLine = 12;
+    setCfgSportGoalCoords([
+        [goalLine, halfh],
+        [w - goalLine, halfh],
+    ]);
+
     if (w !== 0 && h !== 0 && (storedWidth !== w || storedHeight !== h)) {
         dataStorage.set("width", w);
         dataStorage.set("height", h);
@@ -287,16 +304,18 @@ function customIndoorLacrossePlayingAreaSetup() {
         const goal_depth = Math.sqrt(4.5 ** 2 - halfgoal ** 2);
         ga.select(`#${dir}-goal-net`).attr(
             "d",
-            `M 12 ${halfh - halfgoal}
-                 L ${12 - goal_depth} ${halfh}
-                 L 12 ${halfh + halfgoal}`
+            `M ${goalLine} ${halfh - halfgoal}
+                 L ${goalLine - goal_depth} ${halfh}
+                 L ${goalLine} ${halfh + halfgoal}`
         );
 
         const intersect = Math.sqrt(9.25 ** 2 - (goal_depth - 1) ** 2);
         ga.select(`#${dir}-goal-crease`).attr(
             "d",
-            `M ${12 - goal_depth - 1} ${halfh - intersect}
-             A 9.25 9.25 0 1 1  ${12 - goal_depth - 1} ${halfh + intersect}
+            `M ${goalLine - goal_depth - 1} ${halfh - intersect}
+             A 9.25 9.25 0 1 1  ${goalLine - goal_depth - 1} ${
+                halfh + intersect
+            }
              Z`
         );
     }
@@ -356,6 +375,12 @@ function customIceHockeyPlayingAreaSetup() {
     const halfw = w / 2;
     const halfh = h / 2;
 
+    const iihfGoalLineDistance = 4;
+    setCfgSportGoalCoords([
+        [iihfGoalLineDistance, halfh],
+        [w - iihfGoalLineDistance, halfh],
+    ]);
+
     if (w !== 0 && h !== 0 && (storedWidth !== w || storedHeight !== h)) {
         dataStorage.set("width", w);
         dataStorage.set("height", h);
diff --git a/preprocessing/gulpfile.js b/preprocessing/gulpfile.js
@@ -6,7 +6,7 @@ const inject = require("gulp-inject");
 const del = require("del");
 const sports = require("../supported-sports.json").sports;
 
-const indexBanner = true;
+const indexBanner = false;
 const banner = false;
 const analytics = true;
 
diff --git a/setup.js b/setup.js
@@ -29,6 +29,10 @@ export function indexSetup() {
     });
 }
 
+export function setCfgSportGoalCoords(newGoalCoords) {
+    cfgSportGoalCoords = newGoalCoords;
+}
+
 export function setup(s) {
     sport = s;
     dataStorage = localDataStorage(sport);
