web_lib

commit 4e9aae317cb22a1ba6bb1cbe0c4c49b5070cd76f
parent 51990034df4ba965ce650e13fc9436b52cadffd1
Author: triesap <137732411+triesap@users.noreply.github.com>
Date:   Mon, 28 Apr 2025 02:52:09 +0000

apps-lib: edit farms add view

Diffstat:
M
apps-lib/src/lib/types/view/farm.ts
 | 
4
++--
M
apps-lib/src/lib/util/validation/farm.ts
 | 
4
++--
M
apps-lib/src/lib/view/farms-add.svelte
 | 
16
++++------------

3 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/apps-lib/src/lib/types/view/farm.ts b/apps-lib/src/lib/types/view/farm.ts
@@ -1,4 +1,4 @@
-import type { GeolocationAddress, GeolocationPoint, GeometryPoint } from "@radroots/util";
+import type { GeocoderReverseResult, GeolocationAddress, GeolocationPoint, GeometryPoint } from "@radroots/util";
 
 export type IViewFarmsDataListItem = {
     id: string;
@@ -34,6 +34,6 @@ export type IViewFarmsAddSubmission = {
     farm_area_unit?: string;
     farm_contact_name?: string;
     geolocation_point: GeolocationPoint;
-    geolocation_address: GeolocationAddress;
+    geocode_result: GeocoderReverseResult;
 };
 
diff --git a/apps-lib/src/lib/util/validation/farm.ts b/apps-lib/src/lib/util/validation/farm.ts
@@ -1,5 +1,5 @@
 import type { IViewFarmsAddSubmission } from "$lib/types/view/farm";
-import { form_fields, schema_geolocation_address, schema_geolocation_point, zf_numf_pos } from "@radroots/util";
+import { form_fields, schema_geocode_result, schema_geolocation_point, zf_numf_pos } from "@radroots/util";
 import { z } from "zod";
 
 export const schema_view_farms_add_submission: z.ZodSchema<IViewFarmsAddSubmission> = z.object({
@@ -8,5 +8,5 @@ export const schema_view_farms_add_submission: z.ZodSchema<IViewFarmsAddSubmissi
     farm_area_unit: z.string().regex(form_fields.area_unit.validate).optional(),
     farm_contact_name: z.string().regex(form_fields.contact_name.validate).optional(),
     geolocation_point: schema_geolocation_point,
-    geolocation_address: schema_geolocation_address,
+    geocode_result: schema_geocode_result,
 });
 \ No newline at end of file
diff --git a/apps-lib/src/lib/view/farms-add.svelte b/apps-lib/src/lib/view/farms-add.svelte
@@ -108,17 +108,9 @@
         el_id(fmt_id(`farm_location`))?.focus();
     };
 
-    const handle_continue_0 = async (): Promise<void> => {
-        console.log(JSON.stringify(map_geop, null, 4), `map_geop`);
-        console.log(JSON.stringify(map_geoc, null, 4), `map_geoc`);
-        await casl_inc();
-    };
-
     const handle_continue_1 = async (): Promise<void> => {
-        if (!map_geop)
+        if (!map_geop || !map_geoc)
             return void basis.lc_gui_alert(`No farm location provided.`); //@todo
-        if (!farm_geolocation_address)
-            return void basis.lc_gui_alert(`No farm address provided.`); //@todo
         const farms_add_submission = schema_view_farms_add_submission.safeParse(
             {
                 farm_name: val_farmname,
@@ -131,7 +123,7 @@
                     ? val_farmcontact
                     : undefined,
                 geolocation_point: map_geop,
-                geolocation_address: farm_geolocation_address,
+                geocode_result: map_geoc,
             } satisfies IViewFarmsAddSubmission,
         );
 
@@ -147,10 +139,10 @@
 
     const handle_continue = async (): Promise<void> => {
         switch ($casl_i) {
-            case 0:
-                return await handle_continue_0();
             case 1:
                 return await handle_continue_1();
+            default:
+                await casl_inc();
         }
     };