fix(planning-units): follow marxan real usage instead of documentation

api/apps/api/src/modules/scenarios/input-files/cost-surface-view.service.ts

@@ -45,7 +45,7 @@ export class CostSurfaceViewService {
         const tsvRow = [
           data.puid,
           data.spucd_cost ?? 0,
-          data.lockin_status ?? 0,
+          this.#fixMarxanIssue(data.lockin_status) ?? 0,
         ].join(this.#separator);
         responseStream.write(`\n`);
         responseStream.write(tsvRow);
@@ -56,4 +56,22 @@ export class CostSurfaceViewService {
       responseStream.end();
     });
   }
+
+  /**
+   * alicia.arenzana 27.09.2021 10:24
+   even though the manual covers a values 0, 1, 2 for maybe, yes and no (inclusion/exclusion)
+   the software still uses the old version setup 0, 1, 2, 3 for maybe, we don't know, yes and no (exclusion/inclusion) so our 2 should be an exclusion but is intead an inclusion
+   * @param lockinStatus
+   */
+  #fixMarxanIssue = (lockinStatus: number | null): number | null => {
+    if (lockinStatus === 1) {
+      return 2;
+    }
+
+    if (lockinStatus === 2) {
+      return 3;
+    }
+
+    return lockinStatus;
+  };
 }

api/apps/api/test/scenario-input-files/scenario-cost-surface/scenario-cost-surface.e2e-spec.ts

@@ -20,8 +20,8 @@ describe(`When scenario has PUs with cost and lock status`, () => {
     expect(costAndStatus).toMatchInlineSnapshot(`
       Array [
         "0	200	0",
-        "1	400	1",
-        "2	600	2",
+        "1	400	2",
+        "2	600	3",
         "3	800	0",
       ]
     `);

api/apps/geoprocessing/test/integration/planning-unit-grid/planning-units-grid.fixtures.ts

@@ -5,10 +5,11 @@ import { plainToClass } from 'class-transformer';
 import { v4 } from 'uuid';
 import { Job } from 'bullmq';
 import { Repository } from 'typeorm';
+import { booleanEqual } from '@turf/turf';
+import { FeatureCollection } from 'geojson';
 
 import { AppConfig } from '@marxan-geoprocessing/utils/config.utils';
 import { PlanningUnitsGeom } from '@marxan-jobs/planning-unit-geometry';
-
 import { JobInput, JobOutput } from '@marxan/planning-units-grid';
 import { PlanningUnitsGridProcessor } from '@marxan-geoprocessing/modules/planning-units-grid/planning-units-grid.processor';
 
@@ -21,6 +22,9 @@ export const getFixtures = async () => {
   const projectId = v4();
   return {
     cleanup: async () => {
+      await puGeoRepo.delete({
+        projectId,
+      });
       await app.close();
     },
     projectId,
@@ -55,27 +59,32 @@ export const getFixtures = async () => {
         }),
       );
 
-      const geoJsonFromGeometries = (
+      const geoJsonFromGeometries: FeatureCollection = (
         await puGeoRepo.query(
           `
             select json_build_object(
                      'type', 'FeatureCollection',
-                     'features', json_agg(ST_AsGeoJSON((t.*)::record, '', 15)::json)
-                       )
-                     from (
-                       select the_geom
-                       from planning_units_geom
-                       where type = 'from_shapefile'
-                         and project_id = $1
-                     ) as t(geom)
+                     'features',
+                     json_agg(ST_AsGeoJSON((t.*)::record, '', 15)::json)
+                     )
+            from (
+                   select the_geom
+                   from planning_units_geom
+                   where type = 'from_shapefile'
+                     and project_id = $1
+                 ) as t(geom)
           `,
           [projectId],
         )
       )[0].json_build_object;
 
-      expect(underlyingGeoJson.features).toEqual(
-        expect.arrayContaining(geoJsonFromGeometries.features),
-      );
+      for (const geo of underlyingGeoJson.features) {
+        expect(
+          geoJsonFromGeometries.features.some((geoFromJson) =>
+            booleanEqual(geoFromJson, geo),
+          ),
+        ).toBeTruthy();
+      }
 
       expect(output.projectId).toEqual(projectId);
       expect(output.geometryIds.length).toEqual(

api/package.json

@@ -51,7 +51,7 @@
     "@nestjs/typeorm": "^7.1.5",
     "@pgtyped/cli": "0.11.0",
     "@pgtyped/query": "0.11.0",
-    "@turf/turf": "^5.1.6",
+    "@turf/turf": "6.5.0",
     "abort-controller": "3.0.0",
     "archiver": "5.3.0",
     "axios": "0.21.1",