Support common units for fertilizer application amounts (l/ha, m3/ha, ton/ha)

.changeset/fiery-candies-kneel.md

@@ -0,0 +1,5 @@
+---
+"@nmi-agro/fdm-data": minor
+---
+
+Add default values for p_app_amount_unit to baat catalogue

.changeset/late-cycles-tan.md

@@ -0,0 +1,5 @@
+---
+"@nmi-agro/fdm-app": minor
+---
+
+Fertilizer application amounts are now shown in units relevant to the fertilizer type used, possibly saving the user from converting application amounts to kg/ha all the time.

.changeset/ninety-sloths-notice.md

@@ -0,0 +1,5 @@
+---
+"@nmi-agro/fdm-core": minor
+---
+
+addFertilizerApplication and updateFertilizerApplication functions now expect an application value in the unit defined for the fertilizer, instead of kg/ha for every fertilizer. The unit is included in the return values of `getFertilizer`, `getFertilizers` etc. as `p_app_amount_unit`. `getFertilizerApplication`, `getFertilizerApplications` etc. now include `p_app_amount_display` and `p_app_amount_unit` which are to be shown to the user instead of p_app_amount and `kg/ha`.

fdm-agents/src/agents/gerrit/agent.ts

@@ -40,9 +40,10 @@ IMPORTANT CONSTRAINTS:
 6. APPLICATION METHOD: For each application, you must propose a valid "p_app_method". Choose ONLY from the "p_app_method_options" returned by the search tool for that specific fertilizer.
 7. REALISTIC DATES: Ensure all "p_app_date" values are realistic for the crop type, cultivation season, and Dutch climate. Use the provided "b_lu_start" (sowing/start date) as a critical reference point for each crop.
 8. REALISTIC APPLICATION AMOUNTS: Ensure the proposed "p_app_amount" per application matches the technical capabilities of common farming equipment. If the total advice requires more, you MUST split it into multiple applications on different dates.
-   - slurry (drijfmest): 15,000 - 30,000 kg/ha per application (15-30 m³/ha).
-   - Solid manure / compost (vaste mest): 10,000 - 30,000 kg/ha per application (10-30 t/ha).
+   - slurry (drijfmest): 15-30 m³/ha per application.
+   - Solid manure / compost (vaste mest): 10-30 t/ha per application.
    - Mineral fertilizers: 50 - 450 kg/ha per application.
+   - Liquid mineral fertilizers (oplossing): 10 - 1000 l/ha per application.
 9. PRIORITIZATION: If legal norms (especially Nitrogen or Phosphate) limit the total nutrient space on the farm, prioritize fulfilling the nutrient advice for high-value crops (e.g., potatoes, onions, sugar beets, vegetables) over lower-value crops or grasslands. Strategy should focus on maximizing the economic return of the limited nutrient space.
 10. ORGANIC FARMING: If "Organic Farming" is YES, you MUST NOT use any mineral fertilizers ("p_type": "mineral") in the plan.
 11. MANURE FILLING STRATEGY: 
@@ -83,7 +84,14 @@ Your final response MUST be a JSON object with exactly this structure (all field
     {
       "b_id": "string",
       "applications": [
-        { "p_id_catalogue": "string", "p_app_amount": number, "p_app_date": "YYYY-MM-DD", "p_app_method": "string" }
+        { 
+          "p_id_catalogue": "string", 
+          "p_app_amount": number, 
+          "p_app_amount_display": number,
+          "p_app_amount_unit": "kg/ha" | "l/ha" | "t/ha" | "m3/ha",
+          "p_app_date": "YYYY-MM-DD", 
+          "p_app_method": "string" 
+        }
       ],
       "fieldMetrics": {
         "advice": { 
@@ -137,15 +145,27 @@ CALCULATOR REFERENCE (units and semantics for the simulation tool):
 - "omBalance" (organische stofbalans): net organic matter balance, kg EOM/ha. Positive = good. Aim for ≥ 0.
 - "nBalance": nitrogen balance structured exactly as fdm-calculator outputs. "nBalance.balance" and "nBalance.target" are in kg N/ha. "nBalance.emission.ammonia.total" and "nBalance.emission.nitrate.total" are also in kg N/ha. The farm-level averages are automatically area-weighted by the simulation tool. nBalance.balance must be ≤ nBalance.target if keepNitrogenBalanceBelowTarget is YES.
 - "p_app_amount": application amount — **always in kg/ha, regardless of fertilizer type**.
-  - Liquid manure / digestate / slurry: convert m³/ha → kg/ha using 1 m³ = 1000 kg. Round to nearest 1000. Example: 18 m³/ha = 18000 kg/ha.
-  - Solid manure / compost: convert t/ha → kg/ha using 1 t = 1000 kg. Round to nearest 1000. Example: 20 t/ha = 20000 kg/ha.
-  - Mineral fertilizers: already in kg/ha, round to nearest 5 or 10. Example: 200 kg/ha KAS.
+  - Propose a round number for the native display unit (e.g., 25 m³/ha, 20 t/ha, 300 l/ha, 200 kg/ha) and then convert to kg/ha for the tools.
+  - Liquid manure / digestate / slurry: convert m³/ha → kg/ha using: 1 m³/ha = 1000 * density (kg/l).
+    Example: 25 m³/ha with density 1.005 kg/l = 25 * 1000 * 1.005 = 25125 kg/ha.
+  - Solid manure / compost: convert t/ha → kg/ha using: 1 t/ha = 1000 kg/ha.
+    Example: 20 t/ha = 20000 kg/ha.
+  - Liquid mineral fertilizers (e.g. Ammoniumnitraatureanoplossing): convert l/ha → kg/ha using: 1 l/ha = density (kg/l).
+    Example: 300 l/ha with density 1.2 kg/l = 300 * 1.2 = 360 kg/ha.
+  - Solid mineral fertilizers: already in kg/ha, round to nearest 5 or 10.
+    Example: 200 kg/ha KAS.
+- "p_app_amount_display": application amount formatted with its native unit — **use this for the user-facing plan and summary**.
+  - Use the "p_app_amount_unit" and "p_density" (if needed for volume-to-mass conversion) from the search tool results to determine the correct unit.
+  - Liquid manure / slurry: e.g., "18 m³/ha".
+  - Solid manure / compost: e.g., "20 t/ha".
+  - Mineral fertilizers: e.g., "200 kg/ha".
+  - Liquid mineral fertilizers: e.g., "300 l/ha".
 - "p_ef_nh3": ammonia emission factor (fraction of N applied lost as NH3). Lower = less emission.
 TOOL RETURN SHAPES:
 - "getFarmFields" returns { fields: [...] } — access the array via result.fields. Each field includes main cultivation details (b_lu_catalogue, b_lu_name, b_lu_start).
 - "getFarmNutrientAdvice" returns { advicePerField: [...] } — access via result.advicePerField
 - "getFarmLegalNorms" returns { normsPerField: [...] } — access via result.normsPerField
-- "searchFertilizers" returns { fertilizers: [...] } — access via result.fertilizers
+- "searchFertilizers" returns { fertilizers: [...] } — access via result.fertilizers. Each fertilizer includes "p_app_amount_unit" and "p_density".
 - "simulateFarmPlan" returns { fieldResults: [...], farmTotals: {...}, isValid: bool, complianceIssues: [...], agronomicWarnings: [...] }.
   Each entry in "fieldResults" has: { b_id, b_area, isValid, fieldMetrics: { normsFilling: { manure, nitrogen, phosphate }, norms: { manure, nitrogen, phosphate }, proposedDose: { p_dose_n, p_dose_nw, p_dose_p, p_dose_k, p_dose_s, p_dose_mg, p_dose_ca, p_dose_na, p_dose_cu, p_dose_zn, p_dose_b, p_dose_mn, p_dose_mo, p_dose_co }, omBalance, nBalance, advice } }.
   Use "proposedDose.p_dose_nw" (werkzame stikstof, kg/ha) to compare against "advice.d_n_req" — this is the agronomically correct workable-N value. "proposedDose.p_dose_n" is total N and is provided for reference only.

fdm-agents/src/tools/fertilizer-planner/index.ts

@@ -321,6 +321,8 @@ export function createFertilizerPlannerTools(fdm: FdmType) {
                     p_eom: f.p_eom,
                     p_ef_nh3: f.p_ef_nh3,
                     p_source: f.p_source,
+                    p_app_amount_unit: f.p_app_amount_unit,
+                    p_density: f.p_density,
                 })),
             }
         },
@@ -371,6 +373,18 @@ export function createFertilizerPlannerTools(fdm: FdmType) {
                                 p_app_amount: z
                                     .number()
                                     .describe("Application amount in kg/ha"),
+                                p_app_amount_unit: z
+                                    .string()
+                                    .optional()
+                                    .describe(
+                                        "The unit of the application amount (e.g., m3/ha, kg/ha, l/ha, t/ha)",
+                                    ),
+                                p_app_amount_display: z
+                                    .number()
+                                    .optional()
+                                    .describe(
+                                        "The numeric application amount (unit is carried separately in p_app_amount_unit)",
+                                    ),
                                 p_app_date: z
                                     .string()
                                     .describe(

fdm-app/app/components/blocks/fertilizer-applications/columns.tsx

@@ -61,14 +61,16 @@ function formatDateRange(dates: Date[]) {
  * @param numbers array of numbers. Nulls and undefined items are not allowed.
  * @returns the formatted string.
  */
-function formatNumberRange(numbers: number[], unit = "") {
+function formatNumberRange(numbers: number[], unit = "", precision = 2) {
     if (numbers.length === 0) return ""
     const firstNumber = numbers[0]
     const lastNumber = numbers[numbers.length - 1]
+    const pow = 10 ** precision
+    const round = (x: number) => Math.round(pow * x) / pow
     return firstNumber === lastNumber ||
         Math.abs(lastNumber - firstNumber) < Math.abs(firstNumber) / 100
-        ? `${firstNumber} ${unit}`
-        : `${firstNumber} - ${lastNumber} ${unit}`
+        ? `${round(firstNumber)} ${unit}`
+        : `${round(firstNumber)} - ${round(lastNumber)} ${unit}`
 }
 
 /**
@@ -163,10 +165,10 @@ export const columns: ColumnDef<FertAppRecordItem>[] = [
         cell: ({ row }) =>
             formatNumberRange(
                 row.original.applications
-                    .map((application) => application.p_app_amount)
-                    .filter((amount) => amount !== null)
+                    .map((application) => application.p_app_amount_display)
+                    .filter((amount) => amount !== null && amount !== undefined)
                     .sort((a, b) => a - b),
-                "kg / ha",
+                row.original.applications[0]?.p_app_amount_unit ?? "kg/ha",
             ),
     },
     {

fdm-app/app/components/blocks/fertilizer-applications/form.tsx

@@ -9,6 +9,7 @@ import type { Navigation } from "react-router"
 import { Form, useNavigate, useSearchParams } from "react-router"
 import { RemixFormProvider, useRemixForm } from "remix-hook-form"
 import { useFieldFertilizerFormStore } from "@/app/store/field-fertilizer-form"
+import { getApplicationAmountUnitLabel } from "~/components/blocks/fertilizer-applications/utils"
 import { Combobox } from "~/components/custom/combobox"
 import { DatePicker } from "~/components/custom/date-picker-v2"
 import { Button } from "~/components/ui/button"
@@ -36,12 +37,7 @@ import {
     FormSchemaModify,
     type FormSchemaPartial,
 } from "./formschema"
-
-export type FertilizerOption = {
-    value: string
-    label: string
-    applicationMethodOptions?: { value: string; label: string }[]
-}
+import type { FertilizerOption } from "./types.d"
 
 /**
  * Renders a fertilizer application creation or modification form.
@@ -92,7 +88,7 @@ export function FertilizerApplicationForm<T extends typeof FormSchemaPartial>({
                 : fertilizerApplication?.p_app_id,
             p_id: fertilizerApplication?.p_id,
             p_app_method: fertilizerApplication?.p_app_method,
-            p_app_amount: undefined, // Handled through an effect due to blank behavior
+            p_app_amount_display: undefined, // Handled through an effect due to blank behavior
             p_app_date: fertilizerApplication?.p_app_date
                 ? fertilizerApplication.p_app_date
                 : exampleFertilizerApplication
@@ -107,12 +103,17 @@ export function FertilizerApplicationForm<T extends typeof FormSchemaPartial>({
     const selectedFertilizer = options.find((option) => option.value === p_id)
     const isSubmitting = navigation.state !== "idle"
 
+    // If the user switched the fertilizer, clear the application method and amount
     useEffect(() => {
         if (
             p_id &&
             (!fertilizerApplication || fertilizerApplication.p_id !== p_id)
         ) {
             form.setValue("p_app_method", "")
+            form.setValue(
+                "p_app_amount_display",
+                undefined as unknown as number,
+            )
         }
     }, [p_id, fertilizerApplication, form.setValue])
 
@@ -138,6 +139,7 @@ export function FertilizerApplicationForm<T extends typeof FormSchemaPartial>({
 
     const fieldFertilizerFormStore = useFieldFertilizerFormStore()
 
+    // If the user had a saved fertilizer form and was creating a new fertilizer, fill the form back in
     useEffect(() => {
         if (b_id_farm && b_id_or_b_lu_catalogue) {
             const savedFormValues = fieldFertilizerFormStore.load(
@@ -165,11 +167,17 @@ export function FertilizerApplicationForm<T extends typeof FormSchemaPartial>({
     ])
 
     useEffect(() => {
-        const p_app_amount = fertilizerApplication?.p_app_amount
-        if (p_app_amount !== null && typeof p_app_amount !== "undefined") {
-            form.setValue("p_app_amount", p_app_amount)
+        const p_app_amount_display = fertilizerApplication?.p_app_amount_display
+        if (
+            p_app_amount_display !== null &&
+            typeof p_app_amount_display !== "undefined"
+        ) {
+            form.setValue(
+                "p_app_amount_display",
+                Math.round(100 * p_app_amount_display) / 100,
+            )
         }
-    }, [fertilizerApplication?.p_app_amount, form.setValue])
+    }, [fertilizerApplication?.p_app_amount_display, form.setValue])
 
     // Change fertilizer selection if the user has added a new fertilizer
     const new_p_id = searchParams.get("p_id")
@@ -209,6 +217,12 @@ export function FertilizerApplicationForm<T extends typeof FormSchemaPartial>({
         )
     }
 
+    const currentApplicationUnit =
+        options.find((opt) => opt.value === p_id)?.p_app_amount_unit ?? "kg/ha"
+    const currentApplicationUnitLabel = getApplicationAmountUnitLabel(
+        currentApplicationUnit,
+    )
+
     return (
         <RemixFormProvider {...form}>
             <Form
@@ -293,21 +307,25 @@ export function FertilizerApplicationForm<T extends typeof FormSchemaPartial>({
                             )}
                         />
                         <Controller
-                            name="p_app_amount"
+                            name="p_app_amount_display"
                             render={({ field, fieldState }) => (
                                 <Field
                                     data-invalid={fieldState.invalid}
                                     className="gap-1"
                                 >
-                                    <FieldLabel>Hoeveelheid</FieldLabel>
+                                    <FieldLabel>
+                                        Hoeveelheid (
+                                        {currentApplicationUnitLabel})
+                                    </FieldLabel>
                                     <Input
                                         {...field}
                                         placeholder={
                                             Number.isFinite(
-                                                exampleFertilizerApplication?.p_app_amount,
-                                            )
-                                                ? `Er zijn verschillende waarden ingevuld, bv: ${exampleFertilizerApplication?.p_app_amount} kg / ha`
-                                                : "Bv. 37500 kg / ha"
+                                                exampleFertilizerApplication?.p_app_amount_display,
+                                            ) &&
+                                            fertilizerApplication?.p_id === p_id
+                                                ? `Er zijn verschillende waarden ingevuld, bv: ${exampleFertilizerApplication?.p_app_amount_display} ${currentApplicationUnitLabel}`
+                                                : `Bv. ${({ "kg/ha": "3700", "ton/ha": "3.7", "l/ha": "3700", "m3/ha": "3.7" } as const)[currentApplicationUnit]} ${currentApplicationUnitLabel}`
                                         }
                                         aria-required="true"
                                         aria-invalid={fieldState.invalid}

fdm-app/app/components/blocks/fertilizer-applications/formschema.tsx

@@ -1,7 +1,7 @@
 import { z } from "zod"
 
 const fields = {
-    p_app_amount: z.preprocess(
+    p_app_amount_display: z.preprocess(
         (val) => (typeof val === "string" && val !== "" ? Number(val) : val),
         z
             .number({

fdm-app/app/components/blocks/fertilizer-applications/list.tsx

@@ -106,8 +106,17 @@ export function FertilizerApplicationsList({
                                         </ItemTitle>
                                         <ItemDescription>
                                             <p>
-                                                {application.p_app_amount} kg /
-                                                ha
+                                                {application.p_app_amount_display !==
+                                                    null &&
+                                                application.p_app_amount_display !==
+                                                    undefined
+                                                    ? `${application.p_app_amount_display} ${application.p_app_amount_unit}`
+                                                    : application.p_app_amount !==
+                                                            null &&
+                                                        application.p_app_amount !==
+                                                            undefined
+                                                      ? `${application.p_app_amount} kg/ha`
+                                                      : "Onbekend hoeveelheid"}
                                             </p>
                                             <p className="text-xs text-muted-foreground">
                                                 {application.p_app_method

fdm-app/app/components/blocks/fertilizer-applications/types.d.tsx

@@ -1,3 +1,4 @@
+import type { AppAmountUnit } from "@nmi-agro/fdm-core"
 import type { ApplicationMethods } from "@nmi-agro/fdm-data"
 
 export interface FertilizerApplication {
@@ -16,6 +17,7 @@ export interface FertilizerOption {
         value: ApplicationMethods
         label: string
     }[]
+    p_app_amount_unit: AppAmountUnit
 }
 
 export interface FertilizerApplicationsFormProps {

fdm-app/app/components/blocks/fertilizer-applications/utils.ts

@@ -0,0 +1,26 @@
+import type { AppAmountUnit } from "@nmi-agro/fdm-core"
+
+export const applicationUnitOptions = {
+    "kg/ha": { label: "kg/ha", totalLabel: "kg" },
+    "ton/ha": { label: "ton/ha", totalLabel: "ton" },
+    "l/ha": { label: "l/ha", totalLabel: "L" },
+    "m3/ha": { label: "m³/ha", totalLabel: "m³" },
+} as const
+
+/**
+ * Get the pretty-printed mass or volume per area unit for fertilizer applications
+ * @param unit unit to get the label for
+ * @returns the pretty-printed unit
+ */
+export function getApplicationAmountUnitLabel(unit: AppAmountUnit) {
+    return applicationUnitOptions[unit].label
+}
+
+/**
+ * Gets the pretty-printed mass or volume unit for fertilizer applications (for when taking sum of areas times application amounts)
+ * @param unit unit to get the corresponding unit for
+ * @returns the pretty-printed corresponding mass or volume unit
+ */
+export function getApplicationAmountTotalUnitLabel(unit: AppAmountUnit) {
+    return applicationUnitOptions[unit].totalLabel
+}

fdm-app/app/components/blocks/fertilizer/form.tsx

@@ -167,7 +167,10 @@ export function FertilizerForm({
                                             key={option.value}
                                             value={option.value}
                                         >
-                                            {`${option.label} (${option.value})`}
+                                            {param.parameter ===
+                                            "p_app_amount_unit"
+                                                ? option.label
+                                                : `${option.label} (${option.value})`}
                                         </SelectItem>
                                     ))}
                                 </SelectContent>