Reorganization and fixes

SleipnirGroup · Jan 10, 2024 · 37b8bcd · 37b8bcd
1 parent 821ca41
commit 37b8bcd
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 27 deletions.
diff --git a/public/fields/2024-field.json b/public/fields/2024-field.json
diff --git a/public/fields/field24.png b/public/fields/field24.png
diff --git a/src/components/field/svg/FieldOverlayRoot.tsx b/src/components/field/svg/FieldOverlayRoot.tsx
@@ -2,7 +2,6 @@ import { observer } from "mobx-react";
 import React, { Component } from "react";
 import DocumentManagerContext from "../../../document/DocumentManager";
 import OverlayWaypoint from "./OverlayWaypoint";
-import FieldImage23 from "./fields/FieldImage23";
 import * as d3 from "d3";
 import FieldGrid from "./FieldGrid";
 import FieldPathLines from "./FieldPathLines";
@@ -99,8 +98,8 @@ class FieldOverlayRoot extends Component<Props, State> {
     this.context.model.uiState.setFieldScalingFactor(factor);
   }
   render() {
-    this.canvasHeightMeters = FieldImage23.WIDTH_M + 1;
-    this.canvasWidthMeters = FieldImage23.LENGTH_M + 1;
+    this.canvasHeightMeters = FieldImage24.WIDTH_M + 1;
+    this.canvasWidthMeters = FieldImage24.LENGTH_M + 1;
     let layers = this.context.model.uiState.layers;
     let constraintSelected = this.context.model.uiState.isConstraintSelected();
     return (
@@ -128,12 +127,15 @@ class FieldOverlayRoot extends Component<Props, State> {
           ref={this.frameRef}
           id="rootFrame"
         >
+          <FieldAxisLines></FieldAxisLines>
           {/* Background */}
           {layers[ViewLayers.Field] && (
-            <FieldImage24 blue={true}></FieldImage24>
+            <>
+              {/* <JSONFieldImage24 opacity={10} imageHeightPx={550} imageWidthPx={1220}></JSONFieldImage24> */}
+              <FieldImage24></FieldImage24>
+            </>
           )}
           {layers[ViewLayers.Grid] && <FieldGrid></FieldGrid>}
-          <FieldAxisLines></FieldAxisLines>
           {/* Obstacle and waypoint mouse capture*/}
           {layers[ViewLayers.Waypoints] &&
             this.context.model.uiState.isNavbarWaypointSelected() && (

diff --git a/src/components/field/svg/fields/Field2024.json b/src/components/field/svg/fields/Field2024.json
@@ -0,0 +1,10 @@
+{
+  "game": "Crescendo",
+  "field-image": "2024-field.png",
+  "field-corners": {
+    "top-left": [113, 25],
+    "bottom-right": [1108, 522]
+  },
+  "field-size": [54.27083, 26.9375],
+  "field-unit": "foot"
+}
diff --git a/src/components/field/svg/fields/FieldImage24.tsx b/src/components/field/svg/fields/FieldImage24.tsx
@@ -1,6 +1,6 @@
 import { Component } from "react";
 
-type Props = { blue: boolean };
+type Props = {};
 
 type State = {};
 

diff --git a/src/components/field/svg/fields/JSONFieldImage24.tsx b/src/components/field/svg/fields/JSONFieldImage24.tsx
@@ -1,6 +1,6 @@
 import { Component } from "react";
 import { FtToM, InToM } from "../../../../util/UnitConversions";
-import defaultFieldJSON from "../../../../../public/fields/2024-field.json";
+import defaultFieldJSON from "./Field2024.json";
 
 type Props = {
   opacity: number;
@@ -16,7 +16,6 @@ export const LENGTH_M = 16.54175;
 export type FieldJSON = {
   game: string;
   "field-image": string;
-  "image-size": [number, number];
   "field-corners": {
     "top-left": [number, number];
     "bottom-right": [number, number];