diff --git a/package-lock.json b/package-lock.json index ca2f9fa..7821ac8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10953,7 +10953,7 @@ }, "node_modules/protobuf-ts": { "version": "1.0.0", - "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#221fb87c9242361c6419d3bd723a83843c60f184", + "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#da863c196ce4fc03beab6099752bbda67d203274", "dependencies": { "protobufjs": "^6.8.8" } diff --git a/src/grain/GrainDescriber.ts b/src/grain/GrainDescriber.ts index 3c5bceb..5698cb7 100644 --- a/src/grain/GrainDescriber.ts +++ b/src/grain/GrainDescriber.ts @@ -139,7 +139,7 @@ export const GrainExtensions: Map = new Map([ [ pond.Grain.GRAIN_CORN, { - name: "Corn", + name: "Corn (Henderson)", group: "Corn", equation: Equation.henderson, a: 0.000066612, @@ -153,6 +153,40 @@ export const GrainExtensions: Map = new Map([ bushelsPerTonne: 39.368 } ], + [ + pond.Grain.GRAIN_CORN_B, + { + name: "Corn (Chung-Pfost)", + group: "Corn", + equation: Equation.chungPfost, + a: 374.34, + b: 0.18662, + c: 31.696, + setTempC: 38.0, + targetMC: 15.6, + img: CornImg, + colour: "#ffef62", + weightConversionKg: 25.4014333665971, + bushelsPerTonne: 39.368 + } + ], + [ + pond.Grain.GRAIN_CORN_C, + { + name: "Corn (Oswin)", + group: "Corn", + equation: Equation.oswin, + a: 15.303, + b: -0.10164, + c: 3.0358, + setTempC: 38.0, + targetMC: 15.6, + img: CornImg, + colour: "#ffef62", + weightConversionKg: 25.4014333665971, + bushelsPerTonne: 39.368 + } + ], [ pond.Grain.GRAIN_MAIZE_WHITE, { @@ -190,7 +224,7 @@ export const GrainExtensions: Map = new Map([ [ pond.Grain.GRAIN_OATS, { - name: "Oats a", + name: "Oats (Henderson)", group: "Oats", equation: Equation.henderson, a: 0.000085511, @@ -207,7 +241,7 @@ export const GrainExtensions: Map = new Map([ [ pond.Grain.GRAIN_OATS_B, { - name: "Oats b", + name: "Oats (Chung-Pfost)", group: "Oats", equation: Equation.chungPfost, a: 442.85, @@ -224,7 +258,7 @@ export const GrainExtensions: Map = new Map([ [ pond.Grain.GRAIN_OATS_C, { - name: "Oats c", + name: "Oats (Oswin)", group: "Oats", equation: Equation.oswin, a: 12.412, @@ -543,7 +577,7 @@ export const GrainExtensions: Map = new Map([ ],[ pond.Grain.GRAIN_RYE_A, { - name: "Rye a", + name: "Rye (Henderson)", group: "Rye", equation: Equation.henderson, a: 0.00006343, @@ -558,7 +592,7 @@ export const GrainExtensions: Map = new Map([ ],[ pond.Grain.GRAIN_RYE_B, { - name: "Rye b", + name: "Rye (Chung-Pfost)", group: "Rye", equation: Equation.chungPfost, a: 461.0230, @@ -573,7 +607,7 @@ export const GrainExtensions: Map = new Map([ ],[ pond.Grain.GRAIN_RYE_C, { - name: "Rye c", + name: "Rye (Halsey)", group: "Rye", equation: Equation.halsey, a: 4.2970, @@ -588,7 +622,7 @@ export const GrainExtensions: Map = new Map([ ],[ pond.Grain.GRAIN_RYE_D, { - name: "Rye d", + name: "Rye (Oswin)", group: "Rye", equation: Equation.oswin, a: 11.8870,