feat: soil id for temp location popover (#1594)

Remove old soil ID placeholders and use real soil ID data for the temp location callout/popover. Do some minor cleanup in neighboring areas.
techmatters · Jun 18, 2024 · 84811fb · 84811fb
1 parent b6fe579
commit 84811fb
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 54 deletions.
diff --git a/...nt/src/model/soilId/soilIdPlaceholders.ts → dev-client/src/hooks/useElevationData.ts b/...nt/src/model/soilId/soilIdPlaceholders.ts → dev-client/src/hooks/useElevationData.ts
@@ -15,31 +15,21 @@
  * along with this program. If not, see https://www.gnu.org/licenses/.
  */
 
-export const SOIL_DATA: any = {
-  depthDependentData: [
-    {
-      depthInterval: {start: 0, end: 10},
-      texture: 'CLAY',
-      colorChroma: 0.5,
-      colorHue: 0.5,
-      colorValue: 0.5,
-      rockFragment: 'VOLUME_60',
-    },
-    {
-      depthInterval: {start: 11, end: 20},
-      texture: 'SANDY_CLAY_LOAM',
-      colorChroma: 0.4,
-      colorHue: 0.4,
-      colorValue: 0.4,
-      rockFragment: 'VOLUME_1_15',
-    },
-    {
-      depthInterval: {start: 100, end: 120},
-      texture: undefined,
-      colorChroma: undefined,
-      colorHue: undefined,
-      colorValue: undefined,
-      rockFragment: undefined,
-    },
-  ],
+import {useMemo, useState} from 'react';
+
+import {Coords} from 'terraso-client-shared/types';
+
+import {getElevation} from 'terraso-mobile-client/services';
+
+export const useElevationData = (coords: Coords): number => {
+  const [siteElevationValue, setSiteElevationValue] = useState(0);
+
+  useMemo(async () => {
+    const elevation = await getElevation(coords.latitude, coords.longitude);
+    if (elevation !== undefined) {
+      setSiteElevationValue(elevation);
+    }
+  }, [coords]);
+
+  return siteElevationValue;
 };
diff --git a/dev-client/src/screens/HomeScreen/components/TemporaryLocationCallout.tsx b/dev-client/src/screens/HomeScreen/components/TemporaryLocationCallout.tsx
@@ -15,7 +15,7 @@
  * along with this program. If not, see https://www.gnu.org/licenses/.
  */
 
-import {useCallback, useMemo, useState} from 'react';
+import {useCallback, useMemo} from 'react';
 import {useTranslation} from 'react-i18next';
 import {ActivityIndicator} from 'react-native-paper';
 
@@ -31,13 +31,12 @@ import {
   Row,
 } from 'terraso-mobile-client/components/NativeBaseAdapters';
 import {renderElevation} from 'terraso-mobile-client/components/util/site';
+import {useSoilIdData} from 'terraso-mobile-client/hooks/soilIdHooks';
+import {useElevationData} from 'terraso-mobile-client/hooks/useElevationData';
+import {getTopMatch} from 'terraso-mobile-client/model/soilId/soilIdRanking';
 import {useNavigation} from 'terraso-mobile-client/navigation/hooks/useNavigation';
 import {CalloutDetail} from 'terraso-mobile-client/screens/HomeScreen/components/CalloutDetail';
 import {LatLngDetail} from 'terraso-mobile-client/screens/HomeScreen/components/LatLngDetail';
-import {getElevation} from 'terraso-mobile-client/services';
-
-const TEMP_SOIL_ID_VALUE = 'Clifton';
-const TEMP_ECO_SITE_PREDICTION = 'Loamy Upland';
 
 type Props = {
   coords: Coords;
@@ -52,22 +51,19 @@ export const TemporaryLocationCallout = ({
 }: Props) => {
   const {t} = useTranslation();
   const navigation = useNavigation();
-  const [siteElevationValue, setSiteElevationValue] = useState(0);
 
-  useMemo(async () => {
-    const elevation = await getElevation(coords.latitude, coords.longitude);
-    if (elevation !== undefined) {
-      setSiteElevationValue(elevation);
-    }
-  }, [coords]);
+  const elevation = useElevationData(coords);
+  const soilIdData = useSoilIdData(coords);
+  const isSoilIdReady = soilIdData.status === 'ready';
+  const topSoilMatch = useMemo(() => getTopMatch(soilIdData), [soilIdData]);
 
   const onCreate = useCallback(() => {
     navigation.navigate('CREATE_SITE', {
       coords,
-      elevation: siteElevationValue,
+      elevation: elevation,
     });
     closeCallout();
-  }, [closeCallout, navigation, coords, siteElevationValue]);
+  }, [closeCallout, navigation, coords, elevation]);
 
   const onLearnMore = useCallback(() => {
     navigation.navigate('LOCATION_DASHBOARD', {coords});
@@ -81,20 +77,28 @@ export const TemporaryLocationCallout = ({
       buttons={<CloseButton onPress={closeCallout} />}
       isPopover={true}>
       <Column mt="12px" space="12px">
-        <CalloutDetail
-          label={t('site.soil_id_prediction')}
-          value={TEMP_SOIL_ID_VALUE}
-        />
-        <Divider />
-        <CalloutDetail
-          label={t('site.ecological_site_prediction')}
-          value={TEMP_ECO_SITE_PREDICTION}
-        />
-        <Divider />
-        {siteElevationValue ? (
+        {!isSoilIdReady && <ActivityIndicator size="small" />}
+        {topSoilMatch && (
+          <>
+            <CalloutDetail
+              label={t('site.soil_id_prediction')}
+              value={topSoilMatch.soilInfo.soilSeries.name}
+            />
+            <Divider />
+            <CalloutDetail
+              label={t('site.ecological_site_prediction')}
+              value={
+                topSoilMatch.soilInfo.ecologicalSite?.name ??
+                t('site.soil_id.soil_info.no_matches')
+              }
+            />
+            <Divider />
+          </>
+        )}
+        {elevation ? (
           <CalloutDetail
             label={t('site.elevation_label')}
-            value={renderElevation(t, siteElevationValue)}
+            value={renderElevation(t, elevation)}
           />
         ) : (
           <ActivityIndicator size="small" />

diff --git a/dev-client/src/screens/LocationScreens/LocationDashboardContent.tsx b/dev-client/src/screens/LocationScreens/LocationDashboardContent.tsx
@@ -236,7 +236,10 @@ export const LocationDashboardContent = ({
           <LocationPrediction
             label={t('soil.soil_id')}
             soilName={topSoilMatch.soilInfo.soilSeries.name}
-            ecologicalSiteName={topSoilMatch.soilInfo.ecologicalSite?.name}
+            ecologicalSiteName={
+              topSoilMatch.soilInfo.ecologicalSite?.name ??
+              t('site.soil_id.soil_info.no_matches')
+            }
             onExploreDataPress={onExploreDataPress}
           />
         )}