Feat: Select trees in drawing polygon

package.json

@@ -29,11 +29,11 @@
     "mock-server": "prism mock ./docs/api/spec/query-api.yaml",
     "prepare": "husky install",
     "server-test": "DEBUG=express:* NODE_LOG_LEVEL=debug nodemon server/serverTest.js",
-    "start": "NODE_TLS_REJECT_UNAUTHORIZED='0' NODE_PATH=dist/ node dist/server.js",
-    "start:dev": "NODE_PATH=server/ ts-node -r dotenv/config --project tsconfig.build.json server/server.ts",
+    "start": "cross-env NODE_TLS_REJECT_UNAUTHORIZED='0' NODE_PATH=dist/ node dist/server.js",
+    "start:dev": "cross-env NODE_PATH=server/ ts-node -r dotenv/config --project tsconfig.build.json server/server.ts",
     "test": "npm run test-unit; npm run test-integration;npm run test-repository",
     "test-e2e": "jest ./__tests__/e2e/",
-    "test-integration": "NODE_ENV=test mocha -r dotenv/config dotenv_config_path=.env.test --exit --timeout 20000 './__tests__/supertest.js'",
+    "test-integration": "cross-env NODE_ENV=test mocha -r dotenv/config dotenv_config_path=.env.test --exit --timeout 20000 './__tests__/supertest.js'",
     "test-repository": "jest ./server/infra/database/",
     "test-seedDB": "NODE_ENV=test mocha -r dotenv/config dotenv_config_path=.env.test --timeout 10000 './**/*.spec.js'",
     "test-unit": "jest ./server/models/",
@@ -44,6 +44,7 @@
     "@sentry/node": "^5.1.0",
     "body-parser": "^1.18.2",
     "cors": "^2.8.5",
+    "cross-env": "^7.0.3",
     "dotenv": "^10.0.0",
     "expect-runtime": "^0.7.0",
     "express": "^4.16.2",

server/infra/database/GisRepository.ts

@@ -1,5 +1,5 @@
 import Bounds from 'interfaces/Bounds';
 import HttpError from 'utils/HttpError';
 import Session from './Session';
 
 export default class GisRepository {
@@ -14,7 +14,7 @@
     zoom_level = parseInt(zoom_level);
     lng = parseFloat(lng);
     lat = parseFloat(lat);
     console.log('lng:', lng);
     let sql;
     if (zoom_level <= 11) {
       sql = `
@@ -86,11 +86,32 @@
   LIMIT 1;
     `;
     }
     console.log('query:', sql);
     const result = await this.session.getDB().raw(sql);
     // {"st_asgeojson":"{\"type\":\"Point\",\"coordinates\":[39.1089215842116,-5.12839483715479]}"}
     return result.rows.length > 0
       ? JSON.parse(result.rows[0].st_asgeojson)
       : null;
   }
+
+  async getPointsInsidePolygon(params): Promise<unknown> {
+    const { polygon } = params;
+    let polygonPoints = `${polygon[0].lon} ${polygon[0].lat}`;
+    for (let i = 1; i < polygon.length; i++) {
+      polygonPoints += `, ${polygon[i].lon} ${polygon[i].lat}`;
+    }
+    const sql = `
+    SELECT id, time_created,planter_id,image_url,lat,lon,active,verified,uuid,approved,species_id,token_issued,token_id
+    FROM trees
+    WHERE ST_Contains(ST_MakePolygon(ST_GeomFromText('LINESTRING(${polygonPoints})')), ST_MakePoint(lon,lat))
+    `;
+    // using spatial indexes
+    // const sql = `
+    // SELECT id, time_created,planter_id,image_url,lat,lon,active,verified,uuid,approved,species_id,token_issued,token_id
+    // FROM trees
+    // WHERE ST_Contains(ST_MakePolygon(ST_GeomFromText('LINESTRING(${polygonPoints})',4326)), estimated_geometric_location)
+    // `;
+    const result = await this.session.getDB().raw(sql);
+    return result.rows;
+  }
 }

server/models/Gis.ts

@@ -6,4 +6,7 @@ import GisRepository from '../infra/database/GisRepository';
 
 export default {
   getNearest: delegateRepository<GisRepository, unknown>('getNearest'),
+  getPointsInsidePolygon: delegateRepository<GisRepository, unknown>(
+    'getPointsInsidePolygon',
+  ),
 };

server/routers/gisRouter.ts

@@ -31,5 +31,30 @@ router.get(
     res.end();
   }),
 );
-
+router.post(
+  '/',
+  handlerWrapper(async (req: Request, res: Response) => {
+    // console.log('Reached');
+    Joi.assert(
+      req.body,
+      Joi.object().keys({
+        polygon: Joi.array()
+          .items(
+            Joi.object({
+              lat: Joi.number().required(),
+              lon: Joi.number().required(),
+            }),
+          )
+          .min(4)
+          .required(),
+      }),
+    );
+    const repo = new GisRepository(new Session());
+    const result = await GisModel.getPointsInsidePolygon(repo)(req.body);
+    res.send({
+      trees: result,
+    });
+    res.end();
+  }),
+);
 export default router;