Merge pull request #25 from CIAT-DAPA/develop

Develop

Author: jchemutt

src/src/assets/icons/cowpea.png

@@ -3,6 +3,12 @@
     "UG": [[-1.482, 29.573], [4.231, 35.000]], 
     "TZ": [[-11.761, 29.338], [-0.95, 40.636]],
     "BJ": [[6.225, 0.775], [12.409, 3.851]], 
-    "GH": [[4.738, -3.244], [11.174, 1.191]] 
+    "GH": [[4.738, -3.244], [11.174, 1.191]],
+    "CO": [[-4.231, -79.02], [12.44, -66.87]],
+    "KE": [[-4.68, 33.91], [5.03, 41.90]],
+    "ZM": [[-18.08, 21.99], [-8.22, 33.68]],
+    "PK": [[23.69, 60.88], [37.09, 77.83]],
+    "MA": [[27.67, -13.17], [35.92, -0.99]],
+    "EC": [[-5.02, -81.08], [1.47, -75.19]]
   }
 }

src/src/assets/icons/eleusine.png

@@ -155,15 +155,29 @@ function FilterLeft({
     const file = event.target.files?.[0];
     if (!file) return;
 
+    const GAP_COLOR = "#e31a1c";
+
     // Read TIFF/GeoTIFF
     const reader = new FileReader();
     reader.onload = () => {
       const tiffData = reader.result;
       parseGeoraster(tiffData).then((georaster) => {
+        const nodata =georaster.noDataValue ?? georaster.nodataValue ?? georaster.nodata ?? null;
+        const EPS = 1e-6;
+
+      const pixelValuesToColorFn = (values) => {
+        const v = values?.[0];
+        if (v == null || Number.isNaN(v)) return null;               // transparent
+        if (nodata != null && v === nodata) return null;              // transparent
+        if (Math.abs(v - 1) <= EPS) return GAP_COLOR;                 // color only class 1
+        return null;                                                  // everything else hidden
+      };
         const layer = new GeoRasterLayer({
           georaster,
           opacity: 0.7,
           resolution: 256,
+          resampleMethod: "nearest",
+          pixelValuesToColorFn,
         });
         setImage(layer);
       });
@@ -229,7 +243,6 @@ function FilterLeft({
         }
 
         const requiredHeaders = [
-          "id",
           "species_name",
           "ext_id",
           "crop",
@@ -252,7 +265,27 @@ function FilterLeft({
           return;
         }
 
-        setAccesionsInput(results.data);
+        const cleaned = results.data
+        .map((r) => {
+          const lat = parseFloat(String(r.latitude).trim());
+          const lon = parseFloat(String(r.longitude).trim());
+          return { ...r, latitude: lat, longitude: lon };
+        })
+        .filter((r) =>
+          Number.isFinite(r.latitude) &&
+          Number.isFinite(r.longitude) &&
+          r.latitude >= -90 && r.latitude <= 90 &&
+          r.longitude >= -180 && r.longitude <= 180
+        );
+
+      if (cleaned.length === 0) {
+        setTitlemodal("No valid rows");
+        setTextModal("No rows with valid latitude/longitude were found.");
+        setShowF(true);
+        return;
+      }
+
+     setAccesionsInput(cleaned);
       },
       error: function () {
         setTitlemodal("CSV parsing error");

src/src/assets/icons/peach.png

@@ -16,7 +16,7 @@
     "PROJECT_COUNTRIES": {
     "bolder": ["Benin","Ghana","Tanzania, United Republic of","Uganda"],
     "lga": [],
-    "pdff": ["Colombia","India","Kenya","Nigeria","Zambia"],
+    "pdff": ["Colombia","Kenya","Zambia"],
     "boldwp1": ["Ecuador","Morocco","Pakistan"]
     },
 
@@ -83,7 +83,8 @@
         "Yam (Old World)", 
         "Yam (New World)"
       ],
-      "boldwp1":["Brassica juncea","Brassica napus","Brassica rapa","Chickpea","Cucurbita ficifolia","Barley","Medicago truncatula","Rice","Passiflora tripartita","Physalis preuviana","Solanum betaceum","Wheat (Bread)","Wheat (Durum)"]
+      "boldwp1":["Brassica juncea","Brassica napus","Brassica rapa","Chickpea","Cucurbita ficifolia","Barley","Medicago truncatula","Rice","Passiflora tripartita","Physalis preuviana","Solanum betaceum","Wheat (Bread)","Wheat (Durum)"],
+      "pdff":["Cowpea","Eleusine coracana","Peach palm","Sechium edule","Sorghum"]
 
     },
 
@@ -98,6 +99,12 @@
       "Ecuador": ["Cucurbita ficifolia","Passiflora tripartita","Physalis preuviana","Solanum betaceum"],
       "Morocco": ["Chickpea","Barley","Medicago truncatula","Wheat (Durum)"],
       "Pakistan": ["Brassica juncea","Brassica napus","Brassica rapa","Chickpea","Rice","Wheat (Bread)"]
+    },
+     "pdff": {
+    
+       "Colombia": ["Peach palm","Sechium edule"],
+      "Kenya": ["Eleusine coracana"],
+      "Zambia": ["Cowpea","Sorghum"]
     }
   }
   }

src/src/assets/icons/sechium.png

@@ -28,7 +28,7 @@ const MapLegend = ({ colors, carouselLandraceItems, carouselMajorItems, option2C
                 })}
               {image && (
                 <li>
-                  <span style={{ background: "black", opacity: "0.7" }}></span>
+                  <span style={{ background: "#e31a1c", opacity: "0.7" }}></span>
                   Custom Gap
                 </li>
               )}
@@ -59,7 +59,7 @@ const MapLegend = ({ colors, carouselLandraceItems, carouselMajorItems, option2C
                 })}
               {image && (
                 <li>
-                  <span style={{ background: "black", opacity: "0.7" }}></span>
+                  <span style={{ background: "#e31a1c", opacity: "0.7" }}></span>
                   Custom Gap
                 </li>
               )}
@@ -80,7 +80,7 @@ const MapLegend = ({ colors, carouselLandraceItems, carouselMajorItems, option2C
 
               {image && (
                 <li>
-                  <span style={{ background: "black", opacity: "0.7" }}></span>
+                  <span style={{ background: "#e31a1c", opacity: "0.7" }}></span>
                   Custom Gap 
                 </li>
               )}