@ngageoint/mage.service 6.3.0-beta.2 → 6.3.0-beta.4

package/lib/entities/users/entities.users.d.ts

@@ -1,7 +1,7 @@
 import { PagingParameters, PageOf } from '../entities.global';
 import { Role } from '../authorization/entities.authorization';
 import { Authentication } from '../authentication/entities.authentication';
-export type UserId = string;
+export declare type UserId = string;
 export interface User {
     id: UserId;
     username: string;
@@ -15,7 +15,7 @@ export interface User {
     roleId: string;
     authenticationId: string;
 }
-export type UserExpanded = Omit<User, 'roleId' | 'authenticationId'> & {
+export declare type UserExpanded = Omit<User, 'roleId' | 'authenticationId'> & {
     role: Role;
     authentication: Authentication;
 };

package/lib/entities/users/entities.users.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entities.users.d.ts","sourceRoot":"","sources":["../../../src/entities/users/entities.users.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,yCAAyC,CAAA;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAA;AAE1E,MAAM,MAAM,MAAM,GAAG,MAAM,CAAA;AAE3B,MAAM,WAAW,IAAI;IACnB,EAAE,EAAE,MAAM,CAAA;IACV,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,OAAO,CAAA;IACf,OAAO,EAAE,OAAO,CAAA;IAChB,SAAS,EAAE,IAAI,CAAA;IACf,WAAW,EAAE,IAAI,CAAA;IACjB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,gBAAgB,EAAE,MAAM,CAAA;CAEzB;AAED,MAAM,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,EAAE,QAAQ,GAAG,kBAAkB,CAAC,GAChE;IACA,IAAI,EAAE,IAAI,CAAA;IACV,cAAc,EAAE,cAAc,CAAA;CAC/B,CAAA;AAEH,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,YAAY,CAAA;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,oBAAY,YAAY;IACtB,IAAI,SAAS;IACb,MAAM,WAAW;IACjB,MAAM,WAAW;CAClB;AAED;;;GAGG;AACH,MAAM,WAAW,MAAM;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,CAAA;IAC1C,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAAA;KAAE,CAAC,CAAA;IACnE,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAA;CACtH;AAED,MAAM,WAAW,kBAAmB,SAAQ,gBAAgB;IAC1D;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACtC,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAC5B,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAC9B"}
+{"version":3,"file":"entities.users.d.ts","sourceRoot":"","sources":["../../../src/entities/users/entities.users.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,yCAAyC,CAAA;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAA;AAE1E,oBAAY,MAAM,GAAG,MAAM,CAAA;AAE3B,MAAM,WAAW,IAAI;IACnB,EAAE,EAAE,MAAM,CAAA;IACV,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,OAAO,CAAA;IACf,OAAO,EAAE,OAAO,CAAA;IAChB,SAAS,EAAE,IAAI,CAAA;IACf,WAAW,EAAE,IAAI,CAAA;IACjB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,gBAAgB,EAAE,MAAM,CAAA;CAEzB;AAED,oBAAY,YAAY,GAAG,IAAI,CAAC,IAAI,EAAE,QAAQ,GAAG,kBAAkB,CAAC,GAChE;IACA,IAAI,EAAE,IAAI,CAAA;IACV,cAAc,EAAE,cAAc,CAAA;CAC/B,CAAA;AAEH,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,YAAY,CAAA;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,oBAAY,YAAY;IACtB,IAAI,SAAS;IACb,MAAM,WAAW;IACjB,MAAM,WAAW;CAClB;AAED;;;GAGG;AACH,MAAM,WAAW,MAAM;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,CAAA;IAC1C,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAAA;KAAE,CAAC,CAAA;IACnE,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAA;CACtH;AAED,MAAM,WAAW,kBAAmB,SAAQ,gBAAgB;IAC1D;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACtC,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAC5B,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAC9B"}

package/lib/environment/env.js

@@ -75,7 +75,7 @@ const appEnv = cfenv.getAppEnv({
     }
 });
 if (appEnv.isLocal) {
-    appEnv.port = parseInt(process.env.MAGE_PORT || process.env.PORT) || 4242;
+    appEnv.port = [process.env.MAGE_PORT, process.env.PORT, 4242].map(parseInt).find(x => typeof x === 'number' && !isNaN(x));
 }
 const mongoConfig = appEnv.getServiceCreds('MongoInstance');
 const environment = {

package/lib/environment/env.js.map

@@ -1 +1 @@
-{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/environment/env.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/environment/env.js"],"names":[],"mappings":"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"}

package/lib/export/csv.d.ts

@@ -1,11 +1,21 @@
-export = Csv;
-declare function Csv(options: any): void;
-declare class Csv {
-    constructor(options: any);
-    export(streamable: any): void;
-    streamObservations(stream: any, archive: any, done: any): Promise<void>;
-    flattenObservation(observation: any, cache: any, archive: any): Promise<any>;
-    streamLocations(stream: any, done: any): Promise<void>;
-    flattenLocation(location: any, cache: any): Promise<any>;
+/// <reference types="node" />
+import archiver from 'archiver';
+import { Exporter } from './exporter';
+import stream from 'stream';
+import { ObservationDocument } from '../models/observation';
+import { UserDocument } from '../adapters/users/adapters.users.db.mongoose';
+import { UserLocationDocument } from '../models/location';
+export declare class Csv extends Exporter {
+    export(streamable: NodeJS.WritableStream): void;
+    streamObservations(stream: stream.Transform, archive: archiver.Archiver, done: (err?: any) => any): Promise<void>;
+    flattenObservation(observation: ObservationDocument, cache: {
+        user: UserDocument | null;
+        device: any;
+    }, archive: archiver.Archiver): Promise<void>;
+    streamLocations(stream: stream.Transform, done: (err?: any) => any): Promise<void>;
+    flattenLocation(location: UserLocationDocument, cache: {
+        user: UserDocument | null;
+        device: any;
+    }): Promise<any>;
 }
 //# sourceMappingURL=csv.d.ts.map

package/lib/export/csv.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"csv.d.ts","sourceRoot":"","sources":["../../src/export/csv.js"],"names":[],"mappings":";AAiBA,yCAEC;;IAFD,0BAEC;IASD,8BAgHC;IAED,wEAsBC;IAED,6EAyDC;IAED,uDAyBC;IAED,yDAmBC"}
+{"version":3,"file":"csv.d.ts","sourceRoot":"","sources":["../../src/export/csv.ts"],"names":[],"mappings":";AAGA,OAAO,QAAQ,MAAM,UAAU,CAAA;AAG/B,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AASrC,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,8CAA8C,CAAA;AAC3E,OAAO,EAAE,oBAAoB,EAAkC,MAAM,oBAAoB,CAAA;AAGzF,qBAAa,GAAI,SAAQ,QAAQ;IAE/B,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,cAAc,GAAG,IAAI;IA2FzC,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBjH,kBAAkB,CAAC,WAAW,EAAE,mBAAmB,EAAE,KAAK,EAAE;QAAE,IAAI,EAAE,YAAY,GAAG,IAAI,CAAC;QAAC,MAAM,EAAE,GAAG,CAAA;KAAE,EAAE,OAAO,EAAE,QAAQ,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAsElJ,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BlF,eAAe,CAAC,QAAQ,EAAE,oBAAoB,EAAE,KAAK,EAAE;QAAE,IAAI,EAAE,YAAY,GAAG,IAAI,CAAC;QAAC,MAAM,EAAE,GAAG,CAAA;KAAE,GAAG,OAAO,CAAC,GAAG,CAAC;CAuBvH"}

package/lib/export/csv.js

@@ -1,4 +1,27 @@
 'use strict';
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,240 +31,241 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const util = require('util'), async = require('async'), archiver = require('archiver'), mgrs = require('mgrs'), moment = require('moment'), log = require('winston'), path = require('path'), json2csv = require('json2csv'), Exporter = require('./exporter'), { default: turfCentroid } = require('@turf/centroid'), wkx = require('wkx'), attachmentBase = require('../environment/env').attachmentBaseDirectory, User = require('../models/user'), Device = require('../models/device');
-function Csv(options) {
-    Csv.super_.call(this, options);
-}
-util.inherits(Csv, Exporter);
-module.exports = Csv;
-function excelLink(attachmentName, attachmentNumber) {
-    return `=HYPERLINK("${attachmentName}", "attachment${attachmentNumber}")`;
-}
-Csv.prototype.export = function (streamable) {
-    const observationFields = [{
-            label: 'id',
-            value: 'id'
-        }, {
-            label: 'User',
-            value: 'user'
-        }, {
-            label: 'Device',
-            value: 'device'
-        }, {
-            label: 'Shape Type',
-            value: 'shapeType'
-        }, {
-            label: 'Latitude',
-            value: 'latitude'
-        }, {
-            label: 'Longitude',
-            value: 'longitude'
-        }, {
-            label: 'MGRS',
-            value: 'mgrs'
-        }, {
-            label: 'Date (ISO8601)',
-            value: 'timestamp'
-        }, {
-            label: 'Excel Timestamp (UTC)',
-            value: 'excelTimestamp'
-        }, {
-            label: 'Well Known Text',
-            value: 'wkt'
-        }, {
-            label: 'Location Provider',
-            value: 'provider'
-        }, {
-            label: 'Location Accuracy +/- (meters)',
-            value: 'accuracy'
-        }];
-    this._event.forms
-        .filter(form => !form.archived)
-        .forEach(form => {
-        const formPrefix = this._event.forms.length > 1 ? form.name + '.' : '';
-        form.fields
-            .filter(field => !field.archived)
-            .sort((a, b) => a.id - b.id)
-            .filter(field => field.type !== 'attachment')
-            .forEach(field => {
-            observationFields.push({
-                label: formPrefix + field.title,
-                value: formPrefix + field.name
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Csv = void 0;
+const async_1 = __importDefault(require("async"));
+const archiver_1 = __importDefault(require("archiver"));
+const path_1 = __importDefault(require("path"));
+const exporter_1 = require("./exporter");
+const centroid_1 = __importDefault(require("@turf/centroid"));
+const User = __importStar(require("../models/user"));
+const Device = __importStar(require("../models/device"));
+const json2csv = __importStar(require("json2csv"));
+const mgrs = require('mgrs');
+const log = require('winston');
+const wkx = require('wkx');
+const env_1 = require("../environment/env");
+class Csv extends exporter_1.Exporter {
+    export(streamable) {
+        const observationFields = [
+            { label: 'id', value: 'id' },
+            { label: 'User', value: 'user' },
+            { label: 'Device', value: 'device' },
+            { label: 'Shape Type', value: 'shapeType' },
+            { label: 'Latitude', value: 'latitude' },
+            { label: 'Longitude', value: 'longitude' },
+            { label: 'MGRS', value: 'mgrs' },
+            { label: 'Date (ISO8601)', value: 'timestamp' },
+            { label: 'Excel Timestamp (UTC)', value: 'excelTimestamp' },
+            { label: 'Well Known Text', value: 'wkt' },
+            { label: 'Location Provider', value: 'provider' },
+            { label: 'Location Accuracy +/- (meters)', value: 'accuracy' },
+        ];
+        this._event.forms
+            .filter(form => !form.archived)
+            .forEach(form => {
+            const formPrefix = this._event.forms.length > 1 ? form.name + '.' : '';
+            form.fields
+                .filter(field => !field.archived)
+                .sort((a, b) => a.id - b.id)
+                .filter(field => field.type !== 'attachment')
+                .forEach(field => {
+                observationFields.push({
+                    label: formPrefix + field.title,
+                    value: formPrefix + field.name
+                });
             });
         });
-    });
-    observationFields.push({
-        label: 'Attachment',
-        value: 'attachment'
-    });
-    observationFields.push({
-        label: 'Attachment Excel Link',
-        value: 'attachmentExcelLink'
-    });
-    const locationFields = [
-        'user',
-        'timestamp',
-        'latitude',
-        'longitude',
-        'altitude',
-        'provider',
-        'mgrs',
-        'accuracy',
-        'speed',
-        'bearing',
-        'battery_level',
-        'device'
-    ];
-    const archive = archiver('zip');
-    archive.pipe(streamable);
-    async.parallel([
-        done => {
-            if (!this._filter.exportObservations)
-                return done();
-            const asyncParser = new json2csv.AsyncParser({ fields: observationFields }, { readableObjectMode: true, writableObjectMode: true });
-            archive.append(asyncParser.processor, { name: 'observations.csv' });
-            this.streamObservations(asyncParser.input, archive, err => {
-                done(err);
-            });
-        },
-        done => {
-            if (!this._filter.exportLocations)
-                return done();
-            const asyncParser = new json2csv.AsyncParser({ fields: locationFields }, { readableObjectMode: true, writableObjectMode: true });
-            archive.append(asyncParser.processor, { name: 'locations.csv' });
-            this.streamLocations(asyncParser.input, err => {
-                done(err);
-            });
-        }
-    ], err => {
-        if (err) {
-            log.warn(err);
-        }
-        log.info('done writing csv, finalize archive');
-        archive.finalize();
-    });
-};
-Csv.prototype.streamObservations = function (stream, archive, done) {
-    return __awaiter(this, void 0, void 0, function* () {
-        log.info("Retrieving observations from DB");
-        const cursor = this.requestObservations(this._filter);
-        let cache = {
-            user: null,
-            device: null
-        };
-        let numObservations = 0;
-        cursor.eachAsync((observation) => __awaiter(this, void 0, void 0, function* () {
-            const properties = yield this.flattenObservation(observation, cache, archive);
-            stream.push(properties);
-            numObservations++;
-        })).then(() => {
-            if (cursor)
-                cursor.close;
-            log.info('Successfully wrote ' + numObservations + ' observations to CSV');
-            log.info('done writing observations');
-            stream.push(null);
-            done();
-        }).catch(err => done(err));
-    });
-};
-Csv.prototype.flattenObservation = function (observation, cache, archive) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const properties = observation.properties;
-        properties.id = observation.id;
-        if (!cache.user || cache.user._id.toString() !== observation.userId.toString()) {
-            cache.user = yield User.getUserById(observation.userId);
-        }
-        if (!cache.device || cache.device._id.toString() !== observation.deviceId.toString()) {
-            cache.device = yield Device.getDeviceById(observation.deviceId);
-        }
-        if (cache.user)
-            properties.user = cache.user.username;
-        if (cache.device)
-            properties.device = cache.device.uid;
-        const centroid = turfCentroid(observation);
-        properties.mgrs = mgrs.forward(centroid.geometry.coordinates);
-        properties.shapeType = observation.geometry.type;
-        if (observation.geometry.type === 'Point') {
-            properties.longitude = observation.geometry.coordinates[0];
-            properties.latitude = observation.geometry.coordinates[1];
-        }
-        else {
-            properties.longitude = centroid.geometry.coordinates[0];
-            properties.latitude = centroid.geometry.coordinates[1];
-        }
-        properties.wkt = wkx.Geometry.parseGeoJSON(observation.geometry).toWkt();
-        properties.excelTimestamp = "=DATEVALUE(MID(INDIRECT(ADDRESS(ROW(),COLUMN()-1)),1,10)) + TIMEVALUE(MID(INDIRECT(ADDRESS(ROW(),COLUMN()-1)),12,8))";
-        if (observation.properties && observation.properties.forms) {
-            observation.properties.forms.forEach(observationForm => {
-                const form = this._event.formMap[observationForm.formId];
-                const formPrefix = this._event.forms.length > 1 ? form.name + '.' : '';
-                for (const name in observationForm) {
-                    const field = form.fieldNameToField[name];
-                    if (field) {
-                        properties[formPrefix + field.name] = observationForm[name];
-                        delete observationForm[name];
+        observationFields.push({
+            label: 'Attachment',
+            value: 'attachment'
+        });
+        observationFields.push({
+            label: 'Attachment Orig Name',
+            value: 'attachmentOriginalName'
+        });
+        const locationFields = [
+            'user',
+            'timestamp',
+            'latitude',
+            'longitude',
+            'altitude',
+            'provider',
+            'mgrs',
+            'accuracy',
+            'speed',
+            'bearing',
+            'battery_level',
+            'device'
+        ];
+        const archive = (0, archiver_1.default)('zip');
+        archive.pipe(streamable);
+        async_1.default.parallel([
+            (done) => {
+                if (!this._filter.exportObservations) {
+                    return done();
+                }
+                const asyncParser = new json2csv.AsyncParser({ fields: observationFields }, { readableObjectMode: true, writableObjectMode: true });
+                archive.append(asyncParser.processor, { name: 'observations.csv' });
+                this.streamObservations(asyncParser.input, archive, (err) => {
+                    done(err);
+                });
+            },
+            (done) => {
+                if (!this._filter.exportLocations) {
+                    return done();
+                }
+                const asyncParser = new json2csv.AsyncParser({ fields: locationFields }, { readableObjectMode: true, writableObjectMode: true });
+                archive.append(asyncParser.processor, { name: 'locations.csv' });
+                this.streamLocations(asyncParser.input, (err) => {
+                    done(err);
+                });
+            }
+        ], err => {
+            if (err) {
+                log.warn(err);
+            }
+            log.info('done writing csv, finalize archive');
+            archive.finalize();
+        });
+    }
+    streamObservations(stream, archive, done) {
+        return __awaiter(this, void 0, void 0, function* () {
+            log.info(`fetching observations for csv export`);
+            const cursor = this.requestObservations(this._filter);
+            const cache = {
+                user: null,
+                device: null
+            };
+            let numObservations = 0;
+            cursor
+                .eachAsync((observation) => __awaiter(this, void 0, void 0, function* () {
+                const properties = yield this.flattenObservation(observation, cache, archive);
+                stream.push(properties);
+                numObservations++;
+            }))
+                .then(() => {
+                if (cursor) {
+                    cursor.close;
+                }
+                log.info(`finished writing ${numObservations} observations to csv`);
+                stream.push(null);
+                done();
+            })
+                .catch(err => done(err));
+        });
+    }
+    flattenObservation(observation, cache, archive) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            const flat = Object.assign({ id: observation.id }, observation.properties);
+            if (!cache.user || cache.user._id.toString() !== ((_a = observation.userId) === null || _a === void 0 ? void 0 : _a.toString())) {
+                if (observation.userId) {
+                    cache.user = yield User.getUserById(observation.userId);
+                }
+            }
+            if (!cache.device || cache.device._id.toString() !== ((_b = observation.deviceId) === null || _b === void 0 ? void 0 : _b.toString())) {
+                if (observation.deviceId) {
+                    cache.device = yield Device.getDeviceById(observation.deviceId);
+                }
+            }
+            if (cache.user) {
+                flat.user = cache.user.username;
+            }
+            if (cache.device) {
+                flat.device = cache.device.uid;
+            }
+            const centroid = (0, centroid_1.default)(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 = 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))";
+            if (observation.properties && observation.properties.forms) {
+                observation.properties.forms.forEach(formEntry => {
+                    const form = this._event.formFor(formEntry.formId);
+                    if (!form) {
+                        return;
+                    }
+                    const formPrefix = this._event.forms.length > 1 ? form.name + '.' : '';
+                    for (const field of form.fields) {
+                        const fieldEntry = formEntry[field.name];
+                        if (fieldEntry !== undefined) {
+                            flat[formPrefix + field.name] = fieldEntry;
+                        }
                     }
+                });
+            }
+            if (observation.attachments) {
+                observation.attachments.forEach((attachment, index) => {
+                    if (!attachment.relativePath) {
+                        // exclude attachments that are pending upload and/or not saved
+                        return;
+                    }
+                    const name = path_1.default.basename(attachment.relativePath);
+                    flat.attachment = name;
+                    flat.attachmentOriginalName = attachment.name;
+                    archive.file(path_1.default.join(env_1.attachmentBaseDirectory, attachment.relativePath), { name });
+                });
+            }
+            return flat;
+        });
+    }
+    streamLocations(stream, done) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { startDate, endDate } = this._filter;
+            const cursor = this.requestLocations({ startDate, endDate });
+            const cache = {
+                user: null,
+                device: null
+            };
+            let numLocations = 0;
+            cursor.eachAsync((location) => __awaiter(this, void 0, void 0, function* () {
+                const locationRecord = yield this.flattenLocation(location, cache);
+                stream.push(locationRecord);
+                numLocations++;
+            }))
+                .then(() => {
+                if (cursor) {
+                    cursor.close;
                 }
-            });
-        }
-        if (observation.attachments) {
-            observation.attachments.filter(attachment => {
-                // exclude attachments that are pending upload and/or not saved
-                return attachment.relativePath;
+                log.info('Successfully wrote ' + numLocations + ' locations to CSV');
+                log.info('done writing locations');
+                stream.push(null);
+                done();
             })
-                .forEach((attachment, index) => {
-                const name = path.basename(attachment.relativePath);
-                properties.attachment = attachment.name;
-                properties.attachmentExcelLink = excelLink(name, index);
-                archive.file(path.join(attachmentBase, attachment.relativePath), { name });
-            });
-        }
-        return properties;
-    });
-};
-Csv.prototype.streamLocations = function (stream, done) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const startDate = this._filter.startDate ? moment(this._filter.startDate) : null;
-        const endDate = this._filter.endDate ? moment(this._filter.endDate) : null;
-        log.info("Retrieving locations from DB");
-        const cursor = this.requestLocations({ startDate: startDate, endDate: endDate });
-        let cache = {
-            user: null,
-            device: null
-        };
-        let numLocations = 0;
-        cursor.eachAsync((location) => __awaiter(this, void 0, void 0, function* () {
-            const properties = yield this.flattenLocation(location, cache);
-            stream.push(properties);
-            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));
-    });
-};
-Csv.prototype.flattenLocation = function (location, cache) {
-    return __awaiter(this, void 0, void 0, function* () {
-        log.debug('Flattening location ' + location._id.toString());
-        const properties = location.properties;
-        if (!cache.user || cache.user._id.toString() !== location.userId.toString()) {
-            cache.user = yield User.getUserById(location.userId);
-        }
-        if (!cache.device || cache.device._id.toString() !== properties.deviceId.toString()) {
-            cache.device = yield Device.getDeviceById(properties.deviceId);
-        }
-        if (cache.user)
-            properties.user = cache.user.username;
-        if (cache.device)
-            properties.device = cache.device.uid;
-        properties.longitude = location.geometry.coordinates[0];
-        properties.latitude = location.geometry.coordinates[1];
-        properties.mgrs = mgrs.forward(location.geometry.coordinates);
-        return properties;
-    });
-};
+                .catch(err => done(err));
+        });
+    }
+    flattenLocation(location, cache) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const flat = Object.assign(Object.assign({}, location.properties), { user: undefined, device: undefined, longitude: location.geometry.coordinates[0], latitude: location.geometry.coordinates[1], mgrs: mgrs.forward(location.geometry.coordinates) });
+            if (!cache.user || cache.user._id.toString() !== location.userId.toString()) {
+                cache.user = yield User.getUserById(location.userId);
+            }
+            if (!cache.device || cache.device._id.toString() !== ((_a = flat.deviceId) === null || _a === void 0 ? void 0 : _a.toString())) {
+                cache.device = flat.deviceId ? yield Device.getDeviceById(flat.deviceId) : undefined;
+            }
+            if (cache.user) {
+                flat.user = cache.user.username;
+            }
+            if (cache.device) {
+                flat.device = cache.device.uid;
+            }
+            return flat;
+        });
+    }
+}
+exports.Csv = Csv;
 //# sourceMappingURL=csv.js.map