feat(claims): ✨ Building counts

Author: Nudelsuppe42

package.json

@@ -49,6 +49,7 @@
     "@prisma/client": "^4.7.1",
     "@turf/helpers": "^6.5.0",
     "@turf/turf": "^6.5.0",
+    "axios": "^1.6.7",
     "blurhash": "^2.0.5",
     "body-parser": "^1.20.1",
     "cors": "^2.8.5",

prisma/migrations/20240210111201_claim_osm/migration.sql

@@ -0,0 +1,4 @@
+-- AlterTable
+ALTER TABLE "Claim" ADD COLUMN     "buildings" INTEGER NOT NULL DEFAULT 1,
+ADD COLUMN     "city" TEXT,
+ADD COLUMN     "osmName" TEXT;

prisma/schema.prisma

@@ -142,6 +142,9 @@ model Claim {
   finished    Boolean       @default(false)
   name        String        @default("")
   description String?
+  osmName     String?
+  city        String?
+  buildings   Int           @default(0)
   Application Application[]
   owner       User?         @relation("owner", fields: [ownerId], references: [id])
   builders    User[]        @relation("builders")

src/Core.ts

@@ -12,7 +12,6 @@ import Keycloak from "keycloak-connect";
 import AmazonAWS from "./util/AmazonAWS.js";
 import CronHandler from "./util/CronHandler.js";
 import DiscordIntegration from "./util/DiscordIntegration.js";
-import { rerenderFrontend } from "./util/Frontend.js";
 import KeycloakAdmin from "./util/KeycloakAdmin.js";
 import Web from "./web/Web.js";
 

src/controllers/AdminController.ts

@@ -2,15 +2,21 @@ import { Request, Response } from "express";
 
 import Core from "../Core.js";
 import { ERROR_GENERIC } from "../util/Errors.js";
+import axios from "axios";
+import { toOverpassPolygon } from "../util/Coordinates.js";
 
 class AdminController {
   private core: Core;
+  private progress;
 
   constructor(core: Core) {
     this.core = core;
+    this.progress = {
+      buildings: { done: 0, total: 0 },
+      adresses: { done: 0, total: 0 },
+    };
   }
 
-  // CRON
   public getCronJobs(req: Request, res: Response) {
     const jobs = this.core.getCron().getAll();
 
@@ -27,6 +33,68 @@ class AdminController {
       })
     );
   }
+
+  public getProgress(req: Request, res: Response) {
+    res.send(this.progress);
+  }
+
+  public async getClaimBuildingCounts(req: Request, res: Response) {
+    if (this.progress.buildings > 0) {
+      return ERROR_GENERIC(res, 409, "Recalculations are already ongoing.");
+    }
+
+    const claims = await this.core.getPrisma().claim.findMany({
+      where: {
+        center: { not: null },
+        buildings:
+          req.query.skipExisting === "true"
+            ? 1
+            : {
+                gte: req.query.take ? parseInt(req.query.gte as string) : 0,
+              },
+      },
+      take: req.query.take && parseInt(req.query.take as string),
+      skip: req.query.skip ? parseInt(req.query.skip as string) : 0,
+      select: { buildings: true, id: true, area: true },
+    });
+
+    res.send({ progress: 0, count: claims.length });
+    this.progress.buildings.total = claims.length;
+
+    for (const [i, claim] of claims.entries()) {
+      const polygon = toOverpassPolygon(claim.area);
+
+      const overpassQuery = `[out:json][timeout:25];
+        (
+          node["building"]["building"!~"grandstand"]["building"!~"roof"]["building"!~"garage"]["building"!~"hut"]["building"!~"shed"](poly: "${polygon}");
+          way["building"]["building"!~"grandstand"]["building"!~"roof"]["building"!~"garage"]["building"!~"hut"]["building"!~"shed"](poly: "${polygon}");
+          relation["building"]["building"!~"grandstand"]["building"!~"roof"]["building"!~"garage"]["building"!~"hut"]["building"!~"shed"](poly: "${polygon}");
+        );
+      out count;`;
+
+      const { data } = await axios.get(
+        `https://overpass.kumi.systems/api/interpreter?data=${overpassQuery.replace(
+          "\n",
+          ""
+        )}`
+      );
+      this.core
+        .getLogger()
+        .debug(
+          "Getting buildings for claim " +
+            claim.id +
+            ` (${i + 1}/${claims.length})`
+        );
+
+      const updatedClaim = await this.core.getPrisma().claim.update({
+        where: { id: claim.id },
+        data: { buildings: parseInt(data?.elements[0]?.tags?.total) || 0 },
+      });
+
+      this.progress.buildings.done = i + 1;
+    }
+    this.progress.buildings = { done: 0, total: 0 };
+  }
 }
 
 export default AdminController;

src/util/Coordinates.ts

@@ -36,6 +36,10 @@ export function toLngLat(
   };
 }
 
+export function toOverpassPolygon(coords: string[]): string {
+  return coords.map((c) => `${c.split(", ")[1]} ${c.split(", ")[0]}`).join(" ");
+}
+
 // Parses any acceptable coordinate input into an uniform type (["lng, lat","lng, lat"])
 export function useCoordinateInput(coordinates: string, required?: boolean) {
   return async (req: Request, res: Response, next: NextFunction) => {

src/web/routes/index.ts

@@ -824,6 +824,26 @@ class Routes {
       },
       checkUserPermission(this.web.getCore().getPrisma(), "admin.admin")
     );
+    router.addRoute(
+      RequestMethods.GET,
+      "/admin/progress",
+      async (request, response) => {
+        await adminController.getProgress(request, response);
+      },
+      checkUserPermission(this.web.getCore().getPrisma(), "admin.admin")
+    );
+    router.addRoute(
+      RequestMethods.POST,
+      "/admin/claims/buildings",
+      async (request, response) => {
+        await adminController.getClaimBuildingCounts(request, response);
+      },
+      query("skipExisting").isBoolean().optional(),
+      query("take").isNumeric().optional(),
+      query("skip").isNumeric().optional(),
+      query("gte").isNumeric().optional(),
+      checkUserPermission(this.web.getCore().getPrisma(), "admin.admin")
+    );
   }
 }
 

yarn.lock

@@ -2661,6 +2661,15 @@ axios@^1.6.0:
     form-data "^4.0.0"
     proxy-from-env "^1.1.0"
 
+axios@^1.6.7:
+  version "1.6.7"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.7.tgz#7b48c2e27c96f9c68a2f8f31e2ab19f59b06b0a7"
+  integrity sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==
+  dependencies:
+    follow-redirects "^1.15.4"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
+
 b4a@^1.6.4:
   version "1.6.4"
   resolved "https://registry.npmjs.org/b4a/-/b4a-1.6.4.tgz"
@@ -3655,6 +3664,11 @@ follow-redirects@^1.14.9, follow-redirects@^1.15.0:
   resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz"
   integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
 
+follow-redirects@^1.15.4:
+  version "1.15.5"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.5.tgz#54d4d6d062c0fa7d9d17feb008461550e3ba8020"
+  integrity sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==
+
 form-data@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz"