From 3a27d48f21a3e04626ad59faad095a8835c3065a Mon Sep 17 00:00:00 2001
From: THIS ONE IS A LITTLE BIT TRICKY KRUB <pattadon2546pn@gmail.com>
Date: Thu, 13 Mar 2025 20:43:35 +0700
Subject: [PATCH] feat: enhance map data handling and improve shape detection
 logging in Google Map component

---
 frontend/app/(sidebar)/setup/page.tsx         | 23 +++++---
 .../components/google-map-with-drawing.tsx    | 55 +++++++++----------
 2 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/frontend/app/(sidebar)/setup/page.tsx b/frontend/app/(sidebar)/setup/page.tsx
index 9394e96..7c7badf 100644
--- a/frontend/app/(sidebar)/setup/page.tsx
+++ b/frontend/app/(sidebar)/setup/page.tsx
@@ -20,7 +20,9 @@ export default function SetupPage() {
   const [harvestDetails, setHarvestDetails] = useState<harvestSchema | null>(
     null
   );
-  const [mapData, setMapData] = useState(null);
+  const [mapData, setMapData] = useState<{ lat: number; lng: number }[] | null>(
+    null
+  );
 
   // handle planting details submission
   const handlePlantingDetailsChange = (data: plantingSchema) => {
@@ -33,15 +35,22 @@ export default function SetupPage() {
   };
 
   // handle map area selection
-  const handleMapDataChange = (data: SetStateAction<null>) => {
-    setMapData(data);
+  const handleMapDataChange = (data: { lat: number; lng: number }[]) => {
+    setMapData((prevMapData) => {
+      if (prevMapData) {
+        return [...prevMapData, ...data];
+      } else {
+        return data;
+      }
+    });
   };
 
   // log the changes
   useEffect(() => {
-    console.log(plantingDetails);
-    console.log(harvestDetails);
-  }, [plantingDetails, harvestDetails]);
+    // console.log(plantingDetails);
+    // console.log(harvestDetails);
+    console.table(mapData);
+  }, [plantingDetails, harvestDetails, mapData]);
 
   const handleSubmit = () => {
     if (!plantingDetails || !harvestDetails || !mapData) {
@@ -100,7 +109,7 @@ export default function SetupPage() {
         </div>
         <Separator className="mt-3" />
         <div className="mt-10">
-          {/* <GoogleMapWithDrawing onAreaSelected={handleMapDataChange} /> */}
+          <GoogleMapWithDrawing onAreaSelected={handleMapDataChange} />
         </div>
       </div>
 
diff --git a/frontend/components/google-map-with-drawing.tsx b/frontend/components/google-map-with-drawing.tsx
index 31c2fe0..1f45168 100644
--- a/frontend/components/google-map-with-drawing.tsx
+++ b/frontend/components/google-map-with-drawing.tsx
@@ -1,5 +1,3 @@
-"use client";
-
 import { GoogleMap, LoadScript, DrawingManager } from "@react-google-maps/api";
 import { useState, useCallback } from "react";
 
@@ -10,66 +8,67 @@ const containerStyle = {
 
 const center = { lat: 13.7563, lng: 100.5018 }; // Example: Bangkok, Thailand
 
-const GoogleMapWithDrawing = () => {
+interface GoogleMapWithDrawingProps {
+  onAreaSelected: (data: { lat: number; lng: number }[]) => void;
+}
+
+const GoogleMapWithDrawing = ({
+  onAreaSelected,
+}: GoogleMapWithDrawingProps) => {
   const [map, setMap] = useState<google.maps.Map | null>(null);
 
-  // handles drawing complete
   const onDrawingComplete = useCallback(
     (overlay: google.maps.drawing.OverlayCompleteEvent) => {
-      console.log("Drawing complete:", overlay);
-
       const shape = overlay.overlay;
 
-      // check the shape of the drawing
+      // check the shape of the drawing and extract lat/lng values
       if (shape instanceof google.maps.Polygon) {
-        console.log("Polygon detected:", shape);
         const path = shape.getPath();
         const coordinates = path.getArray().map((latLng) => ({
           lat: latLng.lat(),
           lng: latLng.lng(),
         }));
         console.log("Polygon coordinates:", coordinates);
+        onAreaSelected(coordinates);
       } else if (shape instanceof google.maps.Rectangle) {
-        console.log("Rectangle detected:", shape);
         const bounds = shape.getBounds();
         if (bounds) {
           const northEast = bounds.getNorthEast();
           const southWest = bounds.getSouthWest();
-          console.log("Rectangle coordinates:", {
-            northEast: { lat: northEast.lat(), lng: northEast.lng() },
-            southWest: { lat: southWest.lat(), lng: southWest.lng() },
-          });
-        } else {
-          console.log("Bounds are null, rectangle not fully drawn yet.");
+          const coordinates = [
+            { lat: northEast.lat(), lng: northEast.lng() },
+            { lat: southWest.lat(), lng: southWest.lng() },
+          ];
+          console.log("Rectangle coordinates:", coordinates);
+          onAreaSelected(coordinates);
         }
       } else if (shape instanceof google.maps.Circle) {
-        console.log("Circle detected:", shape);
         const center = shape.getCenter();
         const radius = shape.getRadius();
         if (center) {
-          console.log("Circle center:", {
-            lat: center.lat(),
-            lng: center.lng(),
-            radius: radius, // circle's radius in meters
-          });
-        } else {
-          console.log("Circle center is null.");
+          const coordinates = [
+            {
+              lat: center.lat(),
+              lng: center.lng(),
+              radius: radius, // circle's radius in meters
+            },
+          ];
+          console.log("Circle center:", coordinates);
+          onAreaSelected(coordinates);
         }
       } else if (shape instanceof google.maps.Polyline) {
-        console.log("Polyline detected:", shape);
         const path = shape.getPath();
         const coordinates = path.getArray().map((latLng) => ({
           lat: latLng.lat(),
           lng: latLng.lng(),
         }));
         console.log("Polyline coordinates:", coordinates);
-      }
-      // in case of unrecognized shape types
-      else {
+        onAreaSelected(coordinates);
+      } else {
         console.log("Unknown shape detected:", shape);
       }
     },
-    []
+    [onAreaSelected]
   );
 
   return (