Merge b0eebe7 into f6be1eb

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       postgres:
-        image: postgres:12
+        image: postgis/postgis:12-3.2
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: password

docker-compose.dev.yml

@@ -39,7 +39,7 @@ services:
     restart: unless-stopped
   db:
     container_name: camino_api_db
-    image: postgres:12
+    image: postgis/postgis:12-3.2
     environment:
       PGUSER: ${PGUSER}
       POSTGRES_USER: ${PGUSER}

docker-compose.local.yml

@@ -36,7 +36,7 @@ services:
 
   db:
     container_name: camino_api_db
-    image: postgres:12
+    image: postgis/postgis:12-3.2
     environment:
       PGUSER: ${PGUSER}
       POSTGRES_USER: ${PGUSER}

docker-compose.localhost.yml

@@ -17,7 +17,7 @@ services:
 
   db:
     container_name: camino_api_db
-    image: postgres:12
+    image: postgis/postgis:12-3.2
     environment:
       PGUSER: ${PGUSER}
       POSTGRES_USER: ${PGUSER}

docker-compose.yml

@@ -39,7 +39,7 @@ services:
     restart: unless-stopped
   db:
     container_name: camino_api_db
-    image: postgres:12
+    image: postgis/postgis:12-3.2
     environment:
       PGUSER: ${PGUSER}
       POSTGRES_USER: ${PGUSER}

package.json

@@ -68,7 +68,6 @@
     "@sentry/node": "^6.16.1",
     "@sentry/types": "^6.16.1",
     "@sindresorhus/slugify": "^1.1.2",
-    "@turf/area": "^6.5.0",
     "@turf/center": "^6.5.0",
     "@turf/intersect": "^6.5.0",
     "@types/basic-auth": "^1.1.3",

src/api/graphql/resolvers/points.ts

@@ -230,7 +230,7 @@ const sdomZonesInformationsGet = async (
   }
   const geojsonFeatures = geojsonFeatureMultiPolygon(points as ITitrePoint[])
 
-  const surface = geojsonSurface(geojsonFeatures as Feature)
+  const surface = await geojsonSurface(geojsonFeatures as Feature)
 
   const documentTypeIds = documentTypeIdsBySdomZonesGet(
     etapeSdomZones,

src/tools/geojson.ts

@@ -2,8 +2,8 @@ import rewind from 'geojson-rewind'
 import center from '@turf/center'
 
 import { ITitrePoint, IGeometry } from '../types'
-import area from '@turf/area'
-import { Feature, FeatureCollection, Geometry } from '@turf/helpers'
+import { Feature } from '@turf/helpers'
+import { knex } from '../knex'
 
 // convertit des points
 // en un geojson de type 'MultiPolygon'
@@ -84,10 +84,14 @@ const geojsonCenter = (points: ITitrePoint[]) => {
   return center(geojson).geometry.coordinates
 }
 
-const geojsonSurface = (
-  geojson: Feature<any> | FeatureCollection<any> | Geometry
-) => {
-  return Number.parseFloat((area(geojson) / 1000000).toFixed(2))
+const geojsonSurface = async (geojson: Feature<any>) => {
+  const result: { rows: { area: number }[] } = await knex.raw(
+    `select ST_AREA(
+    ST_GeomFromGeoJSON('${JSON.stringify(geojson.geometry)}'), true) as area`
+  )
+  const area = result.rows[0].area
+
+  return Number.parseFloat((area / 1000000).toFixed(2))
 }
 
 export {