Merge pull request #93 from r00tat/enhancement/sheet-parsing

Verbessertes Parsen der Unwetter Daten
r00tat · Jun 10, 2024 · 7d56490 · 7d56490
2 parents e34b85e + 9a749e6
commit 7d56490
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 56 deletions.
diff --git a/src/components/Map/layers/UnwetterAction.ts b/src/components/Map/layers/UnwetterAction.ts
@@ -45,63 +45,68 @@ function parseTime(time: string | number) {
 
 const fetchUWD = async (sheetId: string, range: string) => {
   console.info(`fetching unwetter data of ${sheetId} ${range}`);
-  const values = await getSpreadsheetData(
+  const [headers, ...values] = await getSpreadsheetData(
     sheetId || process.env.EINSATZMAPPE_SHEET_ID || '',
     range || process.env.EINSATZMAPPE_SHEET_RANGE || ''
   );
   const markers = (
     await Promise.all(
-      values.map(
-        async ([
-          name = '',
-          street = '',
-          number = '',
-          city = 'Neusiedl am See',
-          status = '',
-          fzg = '',
-          description = '',
-          alarmTime = '',
-          start = '',
-          done = '',
-          info = '',
-          latLng = '',
-          title = '',
-        ]) => {
-          let [lat, lng] = parseLatLng(latLng || '');
-          const searchString = `${city} ${street} ${number}`;
-          if ((!lat || !lng) && street) {
-            const [place] = await searchPlace(searchString, {
-              position: defaultGeoPosition,
-              maxResults: 3,
-            });
-
+      values
+        .map((row) => Object.fromEntries(row.map((v, i) => [headers[i], v])))
+        .map(
+          async (
+            {
+              Name: name = '',
+              Straße: street = '',
+              Nummer: number = '',
+              Ort: city = 'Neusiedl am See',
+              'Status kurz': status = '',
+              Fzg: fzg = '',
+              'Status lang': description = '',
+              Alarmzeit: alarmTime = '',
+              Start: start = '',
+              'Erledigt um': done = '',
+              'Info/Alarm': info = '',
+              GPS: latLng = '',
+              Bezeichnung: title = '',
+            },
+            idx
+          ) => {
+            let [lat, lng] = parseLatLng(latLng || '');
+            const searchString = `${city} ${street} ${number}`;
+            // if ((!lat || !lng) && street) {
+            // const [place] = await searchPlace(searchString, {
+            //   position: defaultGeoPosition,
+            //   maxResults: 3,
+            // });
             // console.info(`place: ${searchString}: ${JSON.stringify(place)}`);
-            if (place) {
-              lat = Number.parseFloat(place.lat);
-              lng = Number.parseFloat(place.lon);
-            }
+            // if (place) {
+            //   lat = Number.parseFloat(place.lat);
+            //   lng = Number.parseFloat(place.lon);
+            // }
+            // }
+            const desc =
+              `${searchString}\nStatus: ${status} ${fzg}\n${description}\n${
+                alarmTime && '\nalarmiert: ' + parseTime(alarmTime)
+              }\n${start && 'begonnen: ' + parseTime(start)}${
+                done && '\nabgeschlossen: ' + parseTime(done)
+              }\n${info}`
+                .replace(/\n{2,}/g, '\n')
+                .trim();
+            return {
+              id: `${idx} ${name} ${street} ${number}`.trim(),
+              street,
+              number,
+              city: city,
+              name: title,
+              description: desc,
+              lat,
+              lng,
+              status,
+              idx,
+            } as UnwetterData;
           }
-          const desc =
-            `${searchString}\nStatus: ${status} ${fzg}\n${description}\n${
-              alarmTime && '\nalarmiert: ' + parseTime(alarmTime)
-            }\n${start && 'begonnen: ' + parseTime(start)}${
-              done && '\nabgeschlossen: ' + parseTime(done)
-            }\n${info}`
-              .replace(/\n{2,}/g, '\n')
-              .trim();
-          return {
-            id: `${name} ${lat} ${lng}`.trim(),
-            street,
-            number,
-            city: city,
-            name: title,
-            description: desc,
-            lat,
-            lng,
-            status,
-          } as UnwetterData;
-        }
-      )
+        )
     )
   ).filter(({ lat, lng }) => lat && lng);
 

diff --git a/src/components/Map/layers/UnwetterLayer.tsx b/src/components/Map/layers/UnwetterLayer.tsx
@@ -11,12 +11,14 @@ function useUnwetterSheetData() {
   const firecall = useFirecall();
 
   const refreshData = useCallback(async () => {
-    const unwetterData = await fetchUnwetterData(
-      firecall.sheetId,
-      firecall.range
-    );
-    console.info(`unwetter data`, unwetterData);
-    setUnwetterData(unwetterData);
+    if (firecall.id && firecall.id !== 'unknown') {
+      const unwetterData = await fetchUnwetterData(
+        firecall.sheetId,
+        firecall.range
+      );
+      console.info(`unwetter data`, unwetterData);
+      setUnwetterData(unwetterData);
+    }
   }, [firecall]);
 
   useEffect(() => {