update turf to 7.2.0

Author: ryanslatten

service/npm-shrinkwrap.json

@@ -31,8 +31,8 @@
     "@ngageoint/geopackage": "4.2.6",
     "@ngageoint/mongodb-migrations": "1.0.0",
     "@node-saml/passport-saml": "4.0.4",
-    "@turf/centroid": "6.5.0",
-    "@turf/kinks": "6.5.0",
+    "@turf/centroid": "7.2.0",
+    "@turf/kinks": "7.2.0",
     "@types/geojson": "7946.0.16",
     "@types/json-schema": "7.0.15",
     "@types/mime-types": "2.1.4",

service/package.json

@@ -3,16 +3,16 @@
 import async from 'async'
 import archiver from 'archiver'
 import path from 'path'
-import { AllGeoJSON } from '@turf/helpers'
+import { Polygon } from '@turf/helpers'
 import { Exporter } from './exporter'
-import turfCentroid from '@turf/centroid'
+import centroid from '@turf/centroid'
 import * as User from '../models/user'
 import * as Device from '../models/device'
 import * as json2csv from 'json2csv'
 const mgrs = require('mgrs')
 const log = require('winston')
 const wkx = require('wkx')
-import { attachmentBaseDirectory as attachmentBase } from  '../environment/env'
+import { attachmentBaseDirectory as attachmentBase } from '../environment/env'
 import stream from 'stream'
 import { ObservationDocument } from '../models/observation'
 import { UserDocument } from '../adapters/users/adapters.users.db.mongoose'
@@ -92,7 +92,7 @@ export class Csv extends Exporter {
           });
         },
         (done): void => {
-          if (!this._filter.exportLocations){
+          if (!this._filter.exportLocations) {
             return done();
           }
           const asyncParser = new json2csv.AsyncParser({ fields: locationFields }, { readableObjectMode: true, writableObjectMode: true });
@@ -161,16 +161,16 @@ export class Csv extends Exporter {
       flat.device = cache.device.uid;
     }
 
-    const centroid = turfCentroid(observation as AllGeoJSON);
-    flat.mgrs = mgrs.forward(centroid.geometry.coordinates);
+    const cd = centroid(observation.geometry as Polygon);
+    flat.mgrs = mgrs.forward(cd.geometry.coordinates);
 
     flat.shapeType = observation.geometry.type;
     if (observation.geometry.type === 'Point') {
       flat.longitude = observation.geometry.coordinates[0];
       flat.latitude = observation.geometry.coordinates[1];
     } else {
-      flat.longitude = centroid.geometry.coordinates[0];
-      flat.latitude = centroid.geometry.coordinates[1];
+      flat.longitude = cd.geometry.coordinates[0];
+      flat.latitude = cd.geometry.coordinates[1];
     }
     flat.wkt = wkx.Geometry.parseGeoJSON(observation.geometry).toWkt();
     flat.excelTimestamp = "=DATEVALUE(MID(INDIRECT(ADDRESS(ROW(),COLUMN()-1)),1,10)) + TIMEVALUE(MID(INDIRECT(ADDRESS(ROW(),COLUMN()-1)),12,8))";
@@ -192,7 +192,7 @@ export class Csv extends Exporter {
     }
 
     if (observation.attachments) {
-      observation.attachments.forEach((attachment, index) => {
+      observation.attachments.forEach((attachment) => {
         if (!attachment.relativePath) {
           // exclude attachments that are pending upload and/or not saved
           return
@@ -221,16 +221,16 @@ export class Csv extends Exporter {
       stream.push(locationRecord)
       numLocations++
     })
-    .then(() => {
-      if (cursor) {
-        cursor.close
-      }
-      log.info('Successfully wrote ' + numLocations + ' locations to CSV')
-      log.info('done writing locations')
-      stream.push(null)
-      done()
-    })
-    .catch(err => done(err))
+      .then(() => {
+        if (cursor) {
+          cursor.close
+        }
+        log.info('Successfully wrote ' + numLocations + ' locations to CSV')
+        log.info('done writing locations')
+        stream.push(null)
+        done()
+      })
+      .catch(err => done(err))
   }
 
   async flattenLocation(location: UserLocationDocument, cache: { user: UserDocument | null, device: any }): Promise<any> {

service/src/export/csv.ts

@@ -6,8 +6,7 @@ import archiver from 'archiver'
 import moment from 'moment'
 import stream from 'stream'
 import path from 'path'
-import turfCentroid from '@turf/centroid'
-import { AllGeoJSON } from '@turf/helpers'
+import centroid from '@turf/centroid'
 import { Exporter } from './exporter'
 import { attachmentBaseDirectory as attachmentBase } from '../environment/env'
 import User, { UserDocument } from '../models/user'
@@ -17,7 +16,7 @@ import { FormFieldType } from '../entities/events/entities.events.forms'
 const mgrs = require('mgrs')
 
 const logger = require('../logger')
-const log = [ 'debug', 'info', 'warn', 'error', 'log' ].reduce((log: any, methodName: string): any => {
+const log = ['debug', 'info', 'warn', 'error', 'log'].reduce((log: any, methodName: string): any => {
   const logMethod = logger[methodName] as (...args: any[]) => any
   return {
     ...log,
@@ -64,12 +63,12 @@ export class GeoJson extends Exporter {
   }
 
   mapObservationProperties(observation: ObservationDocument, archive: archiver.Archiver): void {
-    const centroid = turfCentroid(observation as AllGeoJSON)
+    const cd = centroid(observation);
     const exportProperties = {
       ...observation.properties,
       id: observation._id,
       timestamp: moment(observation.properties.timestamp).toISOString(),
-      mgrs: mgrs.forward(centroid.geometry.coordinates),
+      mgrs: mgrs.forward(cd.geometry.coordinates),
     } as any
     delete exportProperties.forms
     const formEntries = observation.properties?.forms || [] as ObservationDocumentFormEntry[]
@@ -88,7 +87,7 @@ export class GeoJson extends Exporter {
             return attachment.relativePath &&
               attachment.fieldName === field.name &&
               String(attachment.observationFormId) === String(formEntry._id)
-            }
+          }
           )
           const attachmentRelPaths = fieldAttachments.map(x => x.relativePath)
           fieldEntryHash[field.name] = attachmentRelPaths
@@ -150,17 +149,17 @@ export class GeoJson extends Exporter {
       stream.write(data);
       numObservations++;
     })
-    .then(() => {
-      if (cursor) {
-        cursor.close()
-      }
-      stream.write(']}');
-      // throw in icons
-      archive.directory(new api.Icon(this._event.id).getBasePath(), 'mage-export/icons', { date: new Date() });
-      log.info(`wrote ${numObservations} observations`);
-      done();
-    })
-    .catch(err => done(err));
+      .then(() => {
+        if (cursor) {
+          cursor.close()
+        }
+        stream.write(']}');
+        // throw in icons
+        archive.directory(new api.Icon(this._event.id).getBasePath(), 'mage-export/icons', { date: new Date() });
+        log.info(`wrote ${numObservations} observations`);
+        done();
+      })
+      .catch(err => done(err));
   }
 
   streamLocations(stream: NodeJS.WritableStream, done: (err?: any) => void): void {
@@ -173,21 +172,21 @@ export class GeoJson extends Exporter {
       if (numLocations > 0) {
         stream.write(',');
       }
-      const centroid = turfCentroid(location);
+      const cd = centroid(location);
       const exportProperties = location.properties as any
-      exportProperties.mgrs = mgrs.forward(centroid.geometry.coordinates);
+      exportProperties.mgrs = mgrs.forward(cd.geometry.coordinates);
       const data = JSON.stringify(location);
       stream.write(data);
       numLocations++;
     })
-    .then(() => {
-      if (cursor) {
-        cursor.close();
-      }
-      stream.write(']}');
-      log.info(`wrote ${numLocations} locations`);
-      done();
-    })
-    .catch(err => done(err));
+      .then(() => {
+        if (cursor) {
+          cursor.close();
+        }
+        stream.write(']}');
+        log.info(`wrote ${numLocations} locations`);
+        done();
+      })
+      .catch(err => done(err));
   }
 }