fix tests and variable names

Author: ryanslatten

service/src/export/csv.ts

@@ -3,9 +3,8 @@
 import async from 'async'
 import archiver from 'archiver'
 import path from 'path'
-import { Polygon } from '@turf/helpers'
 import { Exporter } from './exporter'
-import centroid from '@turf/centroid'
+import { centroid as turfCenteroid } from '@turf/centroid'
 import * as User from '../models/user'
 import * as Device from '../models/device'
 import * as json2csv from 'json2csv'
@@ -161,16 +160,16 @@ export class Csv extends Exporter {
       flat.device = cache.device.uid;
     }
 
-    const cd = centroid(observation.geometry as Polygon);
-    flat.mgrs = mgrs.forward(cd.geometry.coordinates);
+    const centroid = turfCenteroid(observation);
+    flat.mgrs = mgrs.forward(centroid.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 = cd.geometry.coordinates[0];
-      flat.latitude = cd.geometry.coordinates[1];
+      flat.longitude = centroid.geometry.coordinates[0];
+      flat.latitude = centroid.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))";

service/src/export/geojson.ts

@@ -6,7 +6,7 @@ import archiver from 'archiver'
 import moment from 'moment'
 import stream from 'stream'
 import path from 'path'
-import centroid from '@turf/centroid'
+import { centroid as turfCentroid } from '@turf/centroid'
 import { Exporter } from './exporter'
 import { attachmentBaseDirectory as attachmentBase } from '../environment/env'
 import User, { UserDocument } from '../models/user'
@@ -63,12 +63,12 @@ export class GeoJson extends Exporter {
   }
 
   mapObservationProperties(observation: ObservationDocument, archive: archiver.Archiver): void {
-    const cd = centroid(observation);
+    const centroid = turfCentroid(observation);
     const exportProperties = {
       ...observation.properties,
       id: observation._id,
       timestamp: moment(observation.properties.timestamp).toISOString(),
-      mgrs: mgrs.forward(cd.geometry.coordinates),
+      mgrs: mgrs.forward(centroid.geometry.coordinates),
     } as any
     delete exportProperties.forms
     const formEntries = observation.properties?.forms || [] as ObservationDocumentFormEntry[]
@@ -172,9 +172,9 @@ export class GeoJson extends Exporter {
       if (numLocations > 0) {
         stream.write(',');
       }
-      const cd = centroid(location);
+      const centroid = turfCentroid(location);
       const exportProperties = location.properties as any
-      exportProperties.mgrs = mgrs.forward(cd.geometry.coordinates);
+      exportProperties.mgrs = mgrs.forward(centroid.geometry.coordinates);
       const data = JSON.stringify(location);
       stream.write(data);
       numLocations++;

service/src/export/kmlWriter.ts

@@ -3,7 +3,7 @@
 const mgrs = require('mgrs')
 import moment from 'moment'
 import path from 'path'
-import centroid from '@turf/centroid'
+import { centroid as turfCentroid } from '@turf/centroid'
 import { fragment } from 'xmlbuilder2'
 import { UserDocument } from '../models/user'
 import { FormDocument, FormFieldDocument, MageEventDocument } from '../models/event'
@@ -406,20 +406,20 @@ export function generateKMLClose(): string {
 }
 
 export function generateDescription(feature: Feature, sections: any[]): { description: { $: string } } {
-  const cd = centroid(feature);
+  const centroid = turfCentroid(feature);
   const header = [{
     section: [
       {
         span: [{ label: 'Timestamp' }, moment(feature.properties!.timestamp).utc().format('YYYY-MM-DDTHH:mm:ss') + 'Z']
       },
       {
-        span: [{ label: 'Latitude' }, cd.geometry.coordinates[1]]
+        span: [{ label: 'Latitude' }, centroid.geometry.coordinates[1]]
       },
       {
-        span: [{ label: 'Longitude' }, cd.geometry.coordinates[0]]
+        span: [{ label: 'Longitude' }, centroid.geometry.coordinates[0]]
       },
       {
-        span: [{ label: 'MGRS' }, mgrs.forward(cd.geometry.coordinates)]
+        span: [{ label: 'MGRS' }, mgrs.forward(centroid.geometry.coordinates)]
       }
     ]
   }]

web-app/src/app/geometry/geometry.pipe.ts

@@ -41,6 +41,10 @@ export class GeometryPipe implements PipeTransform {
   }
 
   center(value: any): Point {
+    if (!value || !value.coordinates || !Array.isArray(value.coordinates)) {
+      return { type: 'Point', coordinates: [0, 0] }
+    }
+
     const feature: Feature = {
       type: 'Feature',
       properties: {},

web-app/src/app/geometry/geometry.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from "@angular/core";
 import { polygon } from "@turf/helpers";
-import kinks from '@turf/kinks'
+import { kinks as turfKinks } from '@turf/kinks'
 
 @Injectable({
   providedIn: 'root'
@@ -11,8 +11,8 @@ export class GeometryService {
       return false;
     }
 
-    const ks = kinks(polygon(feature.geometry.coordinates));
+    const kinks = turfKinks(polygon(feature.geometry.coordinates));
 
-    return ks.features.length !== 0;
+    return kinks.features.length !== 0;
   }
 }