Reorganize helper functions

Author: vgeorge

packages/web/src/app/map/utils.ts

@@ -1,39 +1,3 @@
-import { geojson as flatgeobuf } from "flatgeobuf";
-import { getFlatGeobufRectangle } from "../utils/get-flatgeobuf-rect";
-
-export async function getFgbData(map: any) {
-  let i = 0;
-  const geojson = { type: "FeatureCollection", features: [] as any[] };
-
-  const iter = flatgeobuf.deserialize(
-    "https://storage.googleapis.com/osm-tardis/2013-02-03T15%3A00.fgb",
-    getFlatGeobufRectangle(map),
-  ) as AsyncGenerator<any>;
-
-  const timestamps = new Set();
-
-  for await (const feature of iter) {
-    const { properties } = feature;
-
-    if (!properties || properties === null || properties === undefined) {
-      continue;
-    }
-
-    if (
-      properties.type !== "relation" &&
-      (properties.changeType === "added" ||
-        properties.changeType === "modifiedNew" ||
-        properties.changeType === "deletedNew")
-    ) {
-      geojson.features.push({ ...feature, id: i });
-      i += 1;
-      timestamps.add(properties.timestamp);
-    }
-  }
-
-  return { geojson, timestamps: Array.from(timestamps).sort() };
-}
-
 export function calculateStats(geojson: any) {
   const stats = {
     tags: {},

packages/web/src/app/reducer/index.ts

@@ -1,8 +1,9 @@
 import { useReducerAsync } from "use-reducer-async";
 import logReducer from "./log.ts";
-import { calculateStats, getFgbData } from "../map/utils.ts";
+import { calculateStats } from "../map/utils.ts";
 import tArea from "@turf/area";
 import tBboxPolygon from "@turf/bbox-polygon";
+import { getFgbData } from "../utils/get-fgb-data.ts";
 
 // TODO move to types.ts
 /* eslint-disable no-unused-vars */
@@ -151,7 +152,7 @@ const asyncActionHandlers: any = {
           type: AppActionTypes.UPDATE_VIEW_START,
         });
 
-        const { geojson, timestamps } = await getFgbData(map);
+        const { geojson, timestamps } = await getFgbData({ map });
 
         map.getSource("data").setData(geojson);
 

packages/web/src/app/utils/get-fgb-data.ts

@@ -0,0 +1,36 @@
+import { geojson as flatgeobuf } from "flatgeobuf";
+import { getFlatGeobufRectangle } from "./get-fgb-rect";
+import { Map } from "maplibre-gl";
+
+export async function getFgbData({ map }: { map: Map }) {
+  let i = 0;
+  const geojson = { type: "FeatureCollection", features: [] as any[] };
+
+  const iter = flatgeobuf.deserialize(
+    "https://storage.googleapis.com/osm-tardis/2013-02-03T15%3A00.fgb",
+    getFlatGeobufRectangle(map),
+  ) as AsyncGenerator<any>;
+
+  const timestamps = new Set();
+
+  for await (const feature of iter) {
+    const { properties } = feature;
+
+    if (!properties || properties === null || properties === undefined) {
+      continue;
+    }
+
+    if (
+      properties.type !== "relation" &&
+      (properties.changeType === "added" ||
+        properties.changeType === "modifiedNew" ||
+        properties.changeType === "deletedNew")
+    ) {
+      geojson.features.push({ ...feature, id: i });
+      i += 1;
+      timestamps.add(properties.timestamp);
+    }
+  }
+
+  return { geojson, timestamps: Array.from(timestamps).sort() };
+}